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/core/StarJson.cpp | |
| parent | 4585c9cafa87cad6b54397af7e9375cc31b72f89 (diff) | |
resolved most of the compiler warnings/errors under gcc
also update xxhash and tinyformat
Diffstat (limited to 'source/core/StarJson.cpp')
| -rw-r--r-- | source/core/StarJson.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/core/StarJson.cpp b/source/core/StarJson.cpp index 3f65e33..54d3fe7 100644 --- a/source/core/StarJson.cpp +++ b/source/core/StarJson.cpp @@ -1025,7 +1025,7 @@ Json jsonMerge(Json const& base, Json const& merger) { if (!res.second) res.first->second = jsonMerge(res.first->second, p.second); } - return move(merged); + return merged; } else if (merger.type() == Json::Type::Null) { return base; |