ARROW-3981: [C++] Rename json.h

As it's only meant for integration testing, rename it to json-integration.h. Author: Antoine Pitrou <antoine@python.org> Closes #3716 from pitrou/ARROW-3981-rename-json-h and squashes the following commits: 1ea70bf <Antoine Pitrou> ARROW-3981: Rename json.h
apache · Feb 21, 2019 · a977250 · a977250
1 parent 6711404
commit a977250
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 11 deletions.
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
@@ -209,7 +209,7 @@ if(ARROW_IPC)
   set(ARROW_IPC_SRCS
       ipc/dictionary.cc
       ipc/feather.cc
-      ipc/json.cc
+      ipc/json-integration.cc
       ipc/json-internal.cc
       ipc/json-simple.cc
       ipc/message.cc

diff --git a/cpp/src/arrow/flight/test-integration-client.cc b/cpp/src/arrow/flight/test-integration-client.cc
@@ -28,7 +28,7 @@
 #include <gflags/gflags.h>
 
 #include "arrow/io/test-common.h"
-#include "arrow/ipc/json.h"
+#include "arrow/ipc/json-integration.h"
 #include "arrow/ipc/writer.h"
 #include "arrow/record_batch.h"
 #include "arrow/table.h"

diff --git a/cpp/src/arrow/flight/test-integration-server.cc b/cpp/src/arrow/flight/test-integration-server.cc
@@ -25,7 +25,7 @@
 #include <gflags/gflags.h>
 
 #include "arrow/io/test-common.h"
-#include "arrow/ipc/json.h"
+#include "arrow/ipc/json-integration.h"
 #include "arrow/record_batch.h"
 #include "arrow/table.h"
 #include "arrow/util/logging.h"

diff --git a/cpp/src/arrow/ipc/api.h b/cpp/src/arrow/ipc/api.h
@@ -20,7 +20,7 @@
 
 #include "arrow/ipc/dictionary.h"
 #include "arrow/ipc/feather.h"
-#include "arrow/ipc/json.h"
+#include "arrow/ipc/json-simple.h"
 #include "arrow/ipc/message.h"
 #include "arrow/ipc/reader.h"
 #include "arrow/ipc/writer.h"

diff --git a/cpp/src/arrow/ipc/json-integration-test.cc b/cpp/src/arrow/ipc/json-integration-test.cc
@@ -30,7 +30,7 @@
 #include <boost/filesystem.hpp>  // NOLINT
 
 #include "arrow/io/file.h"
-#include "arrow/ipc/json.h"
+#include "arrow/ipc/json-integration.h"
 #include "arrow/ipc/reader.h"
 #include "arrow/ipc/writer.h"
 #include "arrow/pretty_print.h"

diff --git a/cpp/src/arrow/ipc/json.cc → cpp/src/arrow/ipc/json-integration.cc b/cpp/src/arrow/ipc/json.cc → cpp/src/arrow/ipc/json-integration.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/ipc/json.h"
+#include "arrow/ipc/json-integration.h"
 
 #include <cstddef>
 #include <memory>

diff --git a/cpp/src/arrow/ipc/json.h → cpp/src/arrow/ipc/json-integration.h b/cpp/src/arrow/ipc/json.h → cpp/src/arrow/ipc/json-integration.h
@@ -17,8 +17,7 @@
 
 // Implement Arrow JSON serialization format
 
-#ifndef ARROW_IPC_JSON_H
-#define ARROW_IPC_JSON_H
+#pragma once
 
 #include <memory>
 #include <string>
@@ -132,5 +131,3 @@ class ARROW_EXPORT JsonReader {
 }  // namespace internal
 }  // namespace ipc
 }  // namespace arrow
-
-#endif  // ARROW_IPC_JSON_H
diff --git a/cpp/src/arrow/ipc/json-test.cc b/cpp/src/arrow/ipc/json-test.cc
@@ -27,8 +27,8 @@
 #include "arrow/array.h"
 #include "arrow/buffer.h"
 #include "arrow/builder.h"
+#include "arrow/ipc/json-integration.h"
 #include "arrow/ipc/json-internal.h"
-#include "arrow/ipc/json.h"
 #include "arrow/ipc/test-common.h"
 #include "arrow/memory_pool.h"
 #include "arrow/record_batch.h"