From 6f896448f9b9e4cac5b883ce981e243bf701b557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A6don=20J=C3=B3hannes=20Sinis?= Date: Sun, 14 Jan 2024 21:40:36 +0000 Subject: [PATCH] Rename json->nlohmann for consistency with standard use of 3rd party lib --- deps/json/include/{json => nlohmann}/json.hpp | 0 examples/demo-app/demo_app.cpp | 2 +- src/polyscope.cpp | 2 +- src/view.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename deps/json/include/{json => nlohmann}/json.hpp (100%) diff --git a/deps/json/include/json/json.hpp b/deps/json/include/nlohmann/json.hpp similarity index 100% rename from deps/json/include/json/json.hpp rename to deps/json/include/nlohmann/json.hpp diff --git a/examples/demo-app/demo_app.cpp b/examples/demo-app/demo_app.cpp index 8af2b5a9..a8be07cb 100644 --- a/examples/demo-app/demo_app.cpp +++ b/examples/demo-app/demo_app.cpp @@ -24,7 +24,7 @@ #include "args/args.hxx" #include "happly.h" -#include "json/json.hpp" +#include "nlohmann/json.hpp" #include "simple_dot_mesh_parser.h" #include "surface_mesh_io.h" diff --git a/src/polyscope.cpp b/src/polyscope.cpp index 914d587c..f4ccf927 100644 --- a/src/polyscope.cpp +++ b/src/polyscope.cpp @@ -16,7 +16,7 @@ #include "stb_image.h" -#include "json/json.hpp" +#include "nlohmann/json.hpp" using json = nlohmann::json; #include "backends/imgui_impl_opengl3.h" diff --git a/src/view.cpp b/src/view.cpp index 5d3c60bc..dd03ef0d 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -7,7 +7,7 @@ #include "imgui.h" -#include "json/json.hpp" +#include "nlohmann/json.hpp" using json = nlohmann::json; namespace polyscope {