You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2016/08/20 01:05:23 UTC

arrow git commit: ARROW-266: [C++] Fix broken build due to Flatbuffers namespace change

Repository: arrow
Updated Branches:
  refs/heads/master c2eb1612d -> 812201a2d


ARROW-266: [C++] Fix broken build due to Flatbuffers namespace change

Author: Wes McKinney <we...@apache.org>

Closes #122 from wesm/ARROW-266 and squashes the following commits:

6193323 [Wes McKinney] Fix broken build due to Flatbuffers namespace change


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/812201a2
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/812201a2
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/812201a2

Branch: refs/heads/master
Commit: 812201a2db1ebabd0f65ebd2774ec8f0880bb8cb
Parents: c2eb161
Author: Wes McKinney <we...@apache.org>
Authored: Fri Aug 19 18:05:16 2016 -0700
Committer: Wes McKinney <we...@apache.org>
Committed: Fri Aug 19 18:05:16 2016 -0700

----------------------------------------------------------------------
 cpp/src/arrow/ipc/adapter.cc           | 2 +-
 cpp/src/arrow/ipc/metadata-internal.cc | 2 +-
 cpp/src/arrow/ipc/metadata-internal.h  | 2 +-
 cpp/src/arrow/ipc/metadata.cc          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/812201a2/cpp/src/arrow/ipc/adapter.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/adapter.cc b/cpp/src/arrow/ipc/adapter.cc
index 3259980..40d372b 100644
--- a/cpp/src/arrow/ipc/adapter.cc
+++ b/cpp/src/arrow/ipc/adapter.cc
@@ -41,7 +41,7 @@
 
 namespace arrow {
 
-namespace flatbuf = apache::arrow::flatbuf;
+namespace flatbuf = org::apache::arrow::flatbuf;
 
 namespace ipc {
 

http://git-wip-us.apache.org/repos/asf/arrow/blob/812201a2/cpp/src/arrow/ipc/metadata-internal.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/metadata-internal.cc b/cpp/src/arrow/ipc/metadata-internal.cc
index 8cd416f..16ba20f 100644
--- a/cpp/src/arrow/ipc/metadata-internal.cc
+++ b/cpp/src/arrow/ipc/metadata-internal.cc
@@ -37,7 +37,7 @@ typedef flatbuffers::Offset<void> Offset;
 
 namespace arrow {
 
-namespace flatbuf = apache::arrow::flatbuf;
+namespace flatbuf = org::apache::arrow::flatbuf;
 
 namespace ipc {
 

http://git-wip-us.apache.org/repos/asf/arrow/blob/812201a2/cpp/src/arrow/ipc/metadata-internal.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/metadata-internal.h b/cpp/src/arrow/ipc/metadata-internal.h
index 871b5bc..5faa8c9 100644
--- a/cpp/src/arrow/ipc/metadata-internal.h
+++ b/cpp/src/arrow/ipc/metadata-internal.h
@@ -28,7 +28,7 @@
 
 namespace arrow {
 
-namespace flatbuf = apache::arrow::flatbuf;
+namespace flatbuf = org::apache::arrow::flatbuf;
 
 class Buffer;
 struct Field;

http://git-wip-us.apache.org/repos/asf/arrow/blob/812201a2/cpp/src/arrow/ipc/metadata.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/metadata.cc b/cpp/src/arrow/ipc/metadata.cc
index 4fc8ec5..e510755 100644
--- a/cpp/src/arrow/ipc/metadata.cc
+++ b/cpp/src/arrow/ipc/metadata.cc
@@ -33,7 +33,7 @@
 
 namespace arrow {
 
-namespace flatbuf = apache::arrow::flatbuf;
+namespace flatbuf = org::apache::arrow::flatbuf;
 
 namespace ipc {