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/StarRoot.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/source/game/StarRoot.cpp b/source/game/StarRoot.cpp
index 6d23a67..8758447 100644
--- a/source/game/StarRoot.cpp
+++ b/source/game/StarRoot.cpp
@@ -550,7 +550,7 @@ StringList Root::scanForAssetSources(StringList const& directories) {
     String path;
     Maybe<String> name;
     float priority;
-    StringList requires;
+    StringList requires_;
     StringList includes;
   };
   List<shared_ptr<AssetSource>> assetSources;
@@ -589,7 +589,7 @@ StringList Root::scanForAssetSources(StringList const& directories) {
       assetSource->path = fileName;
       assetSource->name = metadata.maybe("name").apply(mem_fn(&Json::toString));
       assetSource->priority = metadata.value("priority", 0.0f).toFloat();
-      assetSource->requires = jsonToStringList(metadata.value("requires", JsonArray{}));
+      assetSource->requires_ = jsonToStringList(metadata.value("requires", JsonArray{}));
       assetSource->includes = jsonToStringList(metadata.value("includes", JsonArray{}));
 
       if (assetSource->name) {
@@ -640,7 +640,7 @@ StringList Root::scanForAssetSources(StringList const& directories) {
         dependencySortVisit(*include);
     }
 
-    for (auto const& requirementName : source->requires) {
+    for (auto const& requirementName : source->requires_) {
       if (auto requirement = namedSources.ptr(requirementName))
         dependencySortVisit(*requirement);
       else
-- 
cgit v1.2.3