Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pitrou wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/src/arrow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/flight/test-integration-client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/flight/test-integration-server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/json-integration-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/json.cc → cpp/src/arrow/ipc/json-integration.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 1 addition & 4 deletions cpp/src/arrow/ipc/json.h → cpp/src/arrow/ipc/json-integration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -132,5 +131,3 @@ class ARROW_EXPORT JsonReader {
} // namespace internal
} // namespace ipc
} // namespace arrow

#endif // ARROW_IPC_JSON_H
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/json-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down