Skip to content

Commit

Permalink
ARROW-266: [C++] Fix broken build due to Flatbuffers namespace change
Browse files Browse the repository at this point in the history
Author: Wes McKinney <wesm@apache.org>

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

6193323 [Wes McKinney] Fix broken build due to Flatbuffers namespace change
  • Loading branch information
wesm committed Aug 20, 2016
1 parent c2eb161 commit 812201a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/adapter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

namespace arrow {

namespace flatbuf = apache::arrow::flatbuf;
namespace flatbuf = org::apache::arrow::flatbuf;

namespace ipc {

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/metadata-internal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ typedef flatbuffers::Offset<void> Offset;

namespace arrow {

namespace flatbuf = apache::arrow::flatbuf;
namespace flatbuf = org::apache::arrow::flatbuf;

namespace ipc {

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/metadata-internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

namespace arrow {

namespace flatbuf = apache::arrow::flatbuf;
namespace flatbuf = org::apache::arrow::flatbuf;

class Buffer;
struct Field;
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/metadata.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

namespace arrow {

namespace flatbuf = apache::arrow::flatbuf;
namespace flatbuf = org::apache::arrow::flatbuf;

namespace ipc {

Expand Down

0 comments on commit 812201a

Please sign in to comment.