diff options
| author | LDA <lda@ldasuku.net> | 2023-06-26 11:48:27 -0700 |
|---|---|---|
| committer | LDA <lda@ldasuku.net> | 2023-06-26 11:58:35 -0700 |
| commit | c9e889723b7af832322d178975e6e440d6cd3ae5 (patch) | |
| tree | a8429c30ecf46ed1388df13b614141e73973cd9f /source/game/StarNpcDatabase.cpp | |
| parent | 4585c9cafa87cad6b54397af7e9375cc31b72f89 (diff) | |
resolved most of the compiler warnings/errors under gcc
also update xxhash and tinyformat
Diffstat (limited to 'source/game/StarNpcDatabase.cpp')
| -rw-r--r-- | source/game/StarNpcDatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/game/StarNpcDatabase.cpp b/source/game/StarNpcDatabase.cpp index 2af5511..dd0a5fc 100644 --- a/source/game/StarNpcDatabase.cpp +++ b/source/game/StarNpcDatabase.cpp @@ -383,7 +383,7 @@ Json NpcDatabase::mergeConfigValues(Json const& base, Json const& merger) const map[entry.first] = mergeConfigValues(map[entry.first], entry.second); } } - return std::move(map); + return map; } else if (merger.isNull()) { return base; } else { |