diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt index 07c404aecde..562d42c5cc0 100644 --- a/cpp/src/arrow/CMakeLists.txt +++ b/cpp/src/arrow/CMakeLists.txt @@ -205,7 +205,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 index 89ae88cb9ee..b3fbb1ba958 100644 --- a/cpp/src/arrow/flight/test-integration-client.cc +++ b/cpp/src/arrow/flight/test-integration-client.cc @@ -28,7 +28,7 @@ #include #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 index 0381e90f9f8..77f57e92b96 100644 --- a/cpp/src/arrow/flight/test-integration-server.cc +++ b/cpp/src/arrow/flight/test-integration-server.cc @@ -25,7 +25,7 @@ #include #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 index 5cc64071317..1895c313193 100644 --- 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 index e3c27fa5dae..a735b6c4e43 100644 --- a/cpp/src/arrow/ipc/json-integration-test.cc +++ b/cpp/src/arrow/ipc/json-integration-test.cc @@ -30,7 +30,7 @@ #include // 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 b/cpp/src/arrow/ipc/json-integration.cc similarity index 99% rename from cpp/src/arrow/ipc/json.cc rename to cpp/src/arrow/ipc/json-integration.cc index 56fe31cbf56..839890ca263 100644 --- a/cpp/src/arrow/ipc/json.cc +++ b/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 #include diff --git a/cpp/src/arrow/ipc/json.h b/cpp/src/arrow/ipc/json-integration.h similarity index 98% rename from cpp/src/arrow/ipc/json.h rename to cpp/src/arrow/ipc/json-integration.h index aeed7070fe9..0256532a4a9 100644 --- a/cpp/src/arrow/ipc/json.h +++ b/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 #include @@ -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 index e13c39c4e8c..72504d45a29 100644 --- 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"