Merge pull request #129 from NuiCpp/feat/compat-updates

Feat/compat updates
NuiCpp · Dec 4, 2024 · 418ac2c · 418ac2c
2 parents 132fbb8 + e4948cf
commit 418ac2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmake/dependencies/roar.cmake b/cmake/dependencies/roar.cmake
@@ -1,6 +1,6 @@
 option(NUI_FETCH_ROAR "Fetch roar" ON)
 set(NUI_ROAR_REPOSITORY "https://github.com/5cript/roar.git" CACHE STRING "roar repository")
-set(NUI_ROAR_TAG "a8eda5bc6d4800a8f389a3007e793eb233ea6192" CACHE STRING "roar tag")
+set(NUI_ROAR_TAG "f1ff8911bdc1d49bc118def679638227337a0e20" CACHE STRING "roar tag")
 
 if(NUI_FETCH_ROAR)
     include(FetchContent)

diff --git a/tools/parcel_adapter/main.cpp b/tools/parcel_adapter/main.cpp
@@ -21,7 +21,7 @@ std::string readFile(std::ifstream& ifs)
 void disablePolyfillIfNotSet(nlohmann::json& alias, std::string_view aliasName)
 {
     if (!alias.contains(aliasName))
-        alias[aliasName] = false;
+        alias[std::string{aliasName}] = false;
 }
 
 void addNuiAlias(nlohmann::json& alias)
@@ -58,7 +58,8 @@ int main(int argc, char** argv)
     {
         std::cout << "Expected 3 argument: <package_in.json> <package_out.json> <target-name>, but got " << argc - 1
                   << "\n";
-        std::cout << "Usage: " << argv[0] << " <package_in.json> <package_out.json> <target-name>" << "\n";
+        std::cout << "Usage: " << argv[0] << " <package_in.json> <package_out.json> <target-name>"
+                  << "\n";
         return 1;
     }