move LightGBM-vendored json11 into a LightGBM-specific namespace (fixes

#5944) (#5946)
microsoft · Jun 30, 2023 · 9f78cce · 9f78cce
1 parent 8de30d7
commit 9f78cce
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/include/LightGBM/tree_learner.h b/include/LightGBM/tree_learner.h
@@ -14,7 +14,7 @@
 
 namespace LightGBM {
 
-using json11::Json;
+using json11_internal_lightgbm::Json;
 
 /*! \brief forward declaration */
 class Tree;

diff --git a/include/LightGBM/utils/common.h b/include/LightGBM/utils/common.h
@@ -58,7 +58,7 @@ namespace LightGBM {
 
 namespace Common {
 
-using json11::Json;
+using json11_internal_lightgbm::Json;
 
 /*!
 * Imbues the stream with the C locale.

diff --git a/include/LightGBM/utils/json11.h b/include/LightGBM/utils/json11.h
@@ -60,7 +60,7 @@
 #include <utility>
 #include <vector>
 
-namespace json11 {
+namespace json11_internal_lightgbm {
 
 enum JsonParse { STANDARD, COMMENTS };
 
@@ -223,4 +223,4 @@ class JsonValue {
   virtual ~JsonValue() {}
 };
 
-}  // namespace json11
+}  // namespace json11_internal_lightgbm
diff --git a/src/boosting/gbdt.h b/src/boosting/gbdt.h
@@ -29,7 +29,7 @@
 
 namespace LightGBM {
 
-using json11::Json;
+using json11_internal_lightgbm::Json;
 
 /*!
 * \brief GBDT algorithm implementation. including Training, prediction, bagging.

diff --git a/src/io/dataset_loader.cpp b/src/io/dataset_loader.cpp
@@ -15,7 +15,7 @@
 
 namespace LightGBM {
 
-using json11::Json;
+using json11_internal_lightgbm::Json;
 
 DatasetLoader::DatasetLoader(const Config& io_config, const PredictFunction& predict_fun, int num_class, const char* filename)
   :config_(io_config), random_(config_.data_random_seed), predict_fun_(predict_fun), num_class_(num_class) {

diff --git a/src/io/json11.cpp b/src/io/json11.cpp
@@ -27,7 +27,7 @@
 #include <cstdlib>
 #include <limits>
 
-namespace json11 {
+namespace json11_internal_lightgbm {
 
 static const int max_depth = 200;
 
@@ -160,7 +160,7 @@ class Value : public JsonValue {
   }
 
   const T m_value;
-  void dump(string *out) const override { json11::dump(m_value, out); }
+  void dump(string *out) const override { json11_internal_lightgbm::dump(m_value, out); }
 };
 
 class JsonDouble final : public Value<Json::NUMBER, double> {
@@ -777,4 +777,4 @@ bool Json::has_shape(const shape &types, string *err) const {
   return true;
 }
 
-}  // namespace json11
+}  // namespace json11_internal_lightgbm
diff --git a/src/treelearner/gpu_tree_learner.h b/src/treelearner/gpu_tree_learner.h
@@ -36,7 +36,7 @@
 
 namespace LightGBM {
 
-using json11::Json;
+using json11_internal_lightgbm::Json;
 
 /*!
 * \brief GPU-based parallel learning algorithm.

diff --git a/src/treelearner/serial_tree_learner.h b/src/treelearner/serial_tree_learner.h
@@ -37,7 +37,7 @@
 
 namespace LightGBM {
 
-using json11::Json;
+using json11_internal_lightgbm::Json;
 
 /*! \brief forward declaration */
 class CostEfficientGradientBoosting;