Skip to content

Commit 0168ad7

Browse files
committed
fix json ambiguity, update examples_tests submodule
1 parent f08a43c commit 0168ad7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tools/nsc/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "nbl/asset/metadata/CHLSLMetadata.h"
1010
#include "nlohmann/json.hpp"
11-
using json = nlohmann::json;
11+
using json = ::nlohmann::json;
1212

1313
using namespace nbl;
1414
using namespace nbl::system;
@@ -34,7 +34,7 @@ class ShaderCompiler final : public system::IApplicationFramework
3434

3535
if (argv[1] == "--dump-build-info")
3636
{
37-
json j;
37+
::json j;
3838

3939
auto& modules = j["modules"];
4040

0 commit comments

Comments
 (0)