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/game/StarNpcDatabase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/game/StarNpcDatabase.cpp')

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