Skip to content

Commit 418ac2c

Browse files
authored
Merge pull request #129 from NuiCpp/feat/compat-updates
Feat/compat updates
2 parents 132fbb8 + e4948cf commit 418ac2c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

cmake/dependencies/roar.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
option(NUI_FETCH_ROAR "Fetch roar" ON)
22
set(NUI_ROAR_REPOSITORY "https://github.com/5cript/roar.git" CACHE STRING "roar repository")
3-
set(NUI_ROAR_TAG "a8eda5bc6d4800a8f389a3007e793eb233ea6192" CACHE STRING "roar tag")
3+
set(NUI_ROAR_TAG "f1ff8911bdc1d49bc118def679638227337a0e20" CACHE STRING "roar tag")
44

55
if(NUI_FETCH_ROAR)
66
include(FetchContent)

tools/parcel_adapter/main.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ std::string readFile(std::ifstream& ifs)
2121
void disablePolyfillIfNotSet(nlohmann::json& alias, std::string_view aliasName)
2222
{
2323
if (!alias.contains(aliasName))
24-
alias[aliasName] = false;
24+
alias[std::string{aliasName}] = false;
2525
}
2626

2727
void addNuiAlias(nlohmann::json& alias)
@@ -58,7 +58,8 @@ int main(int argc, char** argv)
5858
{
5959
std::cout << "Expected 3 argument: <package_in.json> <package_out.json> <target-name>, but got " << argc - 1
6060
<< "\n";
61-
std::cout << "Usage: " << argv[0] << " <package_in.json> <package_out.json> <target-name>" << "\n";
61+
std::cout << "Usage: " << argv[0] << " <package_in.json> <package_out.json> <target-name>"
62+
<< "\n";
6263
return 1;
6364
}
6465

0 commit comments

Comments
 (0)