Repository: orc Updated Branches: refs/heads/master 9551e2704 -> d3240640e
ORC-277. Fix compilation on CentOS 6, which was broken by ORC-261. Fixes #200 Includes: * include adaptor to avoid using noexcept if it is not available. * workaround bug in gcc https://github.com/google/googletest/issues/322 Signed-off-by: Owen O'Malley <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/d3240640 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/d3240640 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/d3240640 Branch: refs/heads/master Commit: d3240640eb279aa97cf9b19664a8a25e9cc4f0b5 Parents: 9551e27 Author: rip-nsk <[email protected]> Authored: Tue Dec 12 11:57:07 2017 -0800 Committer: Owen O'Malley <[email protected]> Committed: Wed Dec 13 10:59:53 2017 -0800 ---------------------------------------------------------------------- c++/include/orc/Exceptions.hh | 2 ++ c++/test/TestWriter.cc | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/d3240640/c++/include/orc/Exceptions.hh ---------------------------------------------------------------------- diff --git a/c++/include/orc/Exceptions.hh b/c++/include/orc/Exceptions.hh index 888bcf9..34b7818 100644 --- a/c++/include/orc/Exceptions.hh +++ b/c++/include/orc/Exceptions.hh @@ -19,6 +19,8 @@ #ifndef ORC_EXCEPTIONS_HH #define ORC_EXCEPTIONS_HH +#include "Adaptor.hh" + #include <stdexcept> #include <string> http://git-wip-us.apache.org/repos/asf/orc/blob/d3240640/c++/test/TestWriter.cc ---------------------------------------------------------------------- diff --git a/c++/test/TestWriter.cc b/c++/test/TestWriter.cc index f89d5f3..c612e3c 100644 --- a/c++/test/TestWriter.cc +++ b/c++/test/TestWriter.cc @@ -283,7 +283,7 @@ namespace orc { EXPECT_EQ(i, static_cast<uint64_t>(atoi(bin.c_str()))); } - EXPECT_EQ(false, rowReader->next(*batch)); + EXPECT_FALSE(rowReader->next(*batch)); } TEST(Writer, writeFloatAndDoubleColumn) { @@ -345,7 +345,7 @@ namespace orc { EXPECT_TRUE(std::abs(static_cast<float>(data[i]) - static_cast<float>(floatBatch->data[i])) < 0.000001f); } - EXPECT_EQ(false, rowReader->next(*batch)); + EXPECT_FALSE(rowReader->next(*batch)); } TEST(Writer, writeShortIntLong) { @@ -685,7 +685,7 @@ namespace orc { EXPECT_EQ(varcharRead, varcharExpected); } - EXPECT_EQ(false, rowReader->next(*batch)); + EXPECT_FALSE(rowReader->next(*batch)); } TEST(Writer, writeDecimal64Column) {
