Merge remote-tracking branch 'origin/main'

ashaduri · May 28, 2024 · ec0445e · ec0445e
2 parents 75f50cd + 4d1af3c
commit ec0445e
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/dependencies/nlohmann_json/CMakeLists.txt b/dependencies/nlohmann_json/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(nlohmann_json INTERFACE)
 
 # Relative sources are allowed only since cmake 3.13.
 target_sources(nlohmann_json INTERFACE
-	${CMAKE_CURRENT_SOURCE_DIR}/json/json.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/nlohmann/json.hpp
 )
 
 target_include_directories(nlohmann_json

diff --git a/dependencies/nlohmann_json/json/json.hpp → dependencies/nlohmann_json/nlohmann/json.hpp b/dependencies/nlohmann_json/json/json.hpp → dependencies/nlohmann_json/nlohmann/json.hpp
diff --git a/src/applib/smartctl_json_ata_parser.cpp b/src/applib/smartctl_json_ata_parser.cpp
@@ -20,7 +20,7 @@ License: GNU General Public License v3.0 only
 #include <vector>
 #include <chrono>
 
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "storage_property.h"
 #include "hz/debug.h"

diff --git a/src/applib/smartctl_json_ata_parser.h b/src/applib/smartctl_json_ata_parser.h
@@ -16,7 +16,7 @@ License: GNU General Public License v3.0 only
 
 #include <string_view>
 
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "hz/error_container.h"
 #include "smartctl_parser_types.h"

diff --git a/src/applib/smartctl_json_basic_parser.cpp b/src/applib/smartctl_json_basic_parser.cpp
@@ -24,7 +24,7 @@ License: GNU General Public License v3.0 only
 #include "hz/string_algo.h"  // string_*
 #include "hz/string_num.h"  // string_is_numeric, number_to_string
 //#include "hz/debug.h"  // debug_*
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 #include "hz/error_container.h"
 
 //#include "smartctl_text_ata_parser.h"

diff --git a/src/applib/smartctl_json_basic_parser.h b/src/applib/smartctl_json_basic_parser.h
@@ -15,7 +15,7 @@ License: GNU General Public License v3.0 only
 //#include <string>
 //#include <vector>
 
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "smartctl_parser.h"
 

diff --git a/src/applib/smartctl_json_nvme_parser.cpp b/src/applib/smartctl_json_nvme_parser.cpp
@@ -20,7 +20,7 @@ License: GNU General Public License v3.0 only
 #include <vector>
 #include <chrono>
 
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "storage_property.h"
 #include "hz/debug.h"

diff --git a/src/applib/smartctl_json_nvme_parser.h b/src/applib/smartctl_json_nvme_parser.h
@@ -16,7 +16,7 @@ License: GNU General Public License v3.0 only
 
 #include <string_view>
 
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "hz/error_container.h"
 #include "smartctl_parser_types.h"

diff --git a/src/applib/smartctl_json_parser_helpers.h b/src/applib/smartctl_json_parser_helpers.h
@@ -19,7 +19,7 @@ License: GNU General Public License v3.0 only
 #include <string_view>
 #include <vector>
 
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 #include "hz/debug.h"
 #include "hz/string_algo.h"
 #include "smartctl_parser_types.h"

diff --git a/src/rconfig/rconfig.h b/src/rconfig/rconfig.h
@@ -12,7 +12,7 @@ License: Zlib
 #ifndef RCONFIG_CONFIG_H
 #define RCONFIG_CONFIG_H
 
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 
 #include <string>
 #include <memory>