From c9e889723b7af832322d178975e6e440d6cd3ae5 Mon Sep 17 00:00:00 2001
From: LDA <lda@ldasuku.net>
Date: Mon, 26 Jun 2023 11:48:27 -0700
Subject: resolved most of the compiler warnings/errors under gcc

also update xxhash and tinyformat
---
 source/core/StarJson.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/core/StarJson.cpp')

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;
-- 
cgit v1.2.3