Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/game/StarMonsterDatabase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/game/StarMonsterDatabase.cpp')
-rw-r--r--source/game/StarMonsterDatabase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/game/StarMonsterDatabase.cpp b/source/game/StarMonsterDatabase.cpp
index 4f6359f..395d873 100644
--- a/source/game/StarMonsterDatabase.cpp
+++ b/source/game/StarMonsterDatabase.cpp
@@ -288,11 +288,11 @@ Json MonsterDatabase::mergePartParameters(Json const& partParameterDescription,
if (pair.second.type() == Json::Type::Array) {
auto array = value.toArray();
array.appendAll(pair.second.toArray());
- value = move(array);
+ value = std::move(array);
} else if (pair.second.type() == Json::Type::Object) {
auto obj = value.toObject();
obj.merge(pair.second.toObject(), true);
- value = move(obj);
+ value = std::move(obj);
}
}
}
@@ -319,7 +319,7 @@ Json MonsterDatabase::mergeFinalParameters(JsonArray const& parameters) {
|| pair.first == "baseSkills") {
auto array = value.optArray().value();
array.appendAll(pair.second.optArray().value());
- value = move(array);
+ value = std::move(array);
} else {
value = jsonMerge(value, pair.second);
}