Repository: orc Updated Branches: refs/heads/master ebf89f571 -> 06a013cab
Fix installation to include all header files - Fixes installation to include all necessary header files in `include/orc` - Removes a few unnecessary includes Fixes #185 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/06a013ca Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/06a013ca Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/06a013ca Branch: refs/heads/master Commit: 06a013cabecea8b9c560abd69d4c2d03509867a5 Parents: ebf89f5 Author: Jim Crist <[email protected]> Authored: Wed Nov 1 17:20:00 2017 -0500 Committer: Owen O'Malley <[email protected]> Committed: Tue Nov 7 09:53:47 2017 -0800 ---------------------------------------------------------------------- c++/include/CMakeLists.txt | 16 ++++------ c++/include/orc/Common.hh | 3 +- c++/include/orc/Exceptions.hh | 58 ++++++++++++++++++++++++++++++++++++ c++/src/ByteRLE.cc | 2 +- c++/src/ColumnReader.cc | 2 +- c++/src/ColumnWriter.hh | 2 +- c++/src/Compression.cc | 2 +- c++/src/Exceptions.cc | 2 +- c++/src/Exceptions.hh | 60 -------------------------------------- c++/src/LzoDecompressor.cc | 2 +- c++/src/OrcFile.cc | 2 +- c++/src/OrcHdfsFile.cc | 2 +- c++/src/RLE.cc | 2 +- c++/src/RLEv1.cc | 2 +- c++/src/RLEv2.hh | 2 +- c++/src/Reader.hh | 2 +- c++/src/Statistics.cc | 2 +- c++/src/StripeStream.cc | 2 +- c++/src/TypeImpl.cc | 2 +- c++/src/Vector.cc | 2 +- c++/src/io/InputStream.cc | 2 +- c++/src/io/OutputStream.cc | 2 +- c++/test/TestColumnPrinter.cc | 2 +- c++/test/TestColumnReader.cc | 2 +- c++/test/TestDecompression.cc | 2 +- tools/src/CMakeLists.txt | 14 +++++---- tools/src/FileContents.cc | 3 +- tools/src/FileMemory.cc | 2 +- tools/src/FileMetadata.cc | 5 ++-- tools/src/FileScan.cc | 2 +- tools/src/FileStatistics.cc | 2 +- tools/src/TimezoneDump.cc | 4 +-- 32 files changed, 103 insertions(+), 108 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/include/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/c++/include/CMakeLists.txt b/c++/include/CMakeLists.txt index 33c5495..8c86d21 100644 --- a/c++/include/CMakeLists.txt +++ b/c++/include/CMakeLists.txt @@ -12,19 +12,15 @@ configure_file ( "orc/orc-config.hh.in" - "${CMAKE_CURRENT_BINARY_DIR}/orc/orc-config.hh" + "orc/orc-config.hh" ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/orc/orc-config.hh" - "orc/ColumnPrinter.hh" - "orc/Common.hh" - "orc/Int128.hh" - "orc/MemoryPool.hh" - "orc/OrcFile.hh" - "orc/Reader.hh" - "orc/Type.hh" - "orc/Vector.hh" - "orc/Statistics.hh" DESTINATION "include/orc" ) + +install(DIRECTORY + "orc/" + DESTINATION "include/orc" + FILES_MATCHING PATTERN "*.hh") http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/include/orc/Common.hh ---------------------------------------------------------------------- diff --git a/c++/include/orc/Common.hh b/c++/include/orc/Common.hh index fc413d5..46ba8e2 100644 --- a/c++/include/orc/Common.hh +++ b/c++/include/orc/Common.hh @@ -21,8 +21,7 @@ #include "orc/Vector.hh" #include "orc/Type.hh" -#include "Exceptions.hh" -#include "wrap/orc-proto-wrapper.hh" +#include "orc/Exceptions.hh" #include <string> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/include/orc/Exceptions.hh ---------------------------------------------------------------------- diff --git a/c++/include/orc/Exceptions.hh b/c++/include/orc/Exceptions.hh new file mode 100644 index 0000000..888bcf9 --- /dev/null +++ b/c++/include/orc/Exceptions.hh @@ -0,0 +1,58 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ORC_EXCEPTIONS_HH +#define ORC_EXCEPTIONS_HH + +#include <stdexcept> +#include <string> + +namespace orc { + + class NotImplementedYet: public std::logic_error { + public: + explicit NotImplementedYet(const std::string& what_arg); + explicit NotImplementedYet(const char* what_arg); + virtual ~NotImplementedYet() noexcept; + NotImplementedYet(const NotImplementedYet&); + private: + NotImplementedYet& operator=(const NotImplementedYet&); + }; + + class ParseError: public std::runtime_error { + public: + explicit ParseError(const std::string& what_arg); + explicit ParseError(const char* what_arg); + virtual ~ParseError() noexcept; + ParseError(const ParseError&); + private: + ParseError& operator=(const ParseError&); + }; + + class InvalidArgument: public std::runtime_error { + public: + explicit InvalidArgument(const std::string& what_arg); + explicit InvalidArgument(const char* what_arg); + virtual ~InvalidArgument() noexcept; + InvalidArgument(const InvalidArgument&); + private: + InvalidArgument& operator=(const InvalidArgument&); + }; +} + +#endif http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/ByteRLE.cc ---------------------------------------------------------------------- diff --git a/c++/src/ByteRLE.cc b/c++/src/ByteRLE.cc index a503977..d9e29fd 100644 --- a/c++/src/ByteRLE.cc +++ b/c++/src/ByteRLE.cc @@ -22,7 +22,7 @@ #include <utility> #include "ByteRLE.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" namespace orc { http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/ColumnReader.cc ---------------------------------------------------------------------- diff --git a/c++/src/ColumnReader.cc b/c++/src/ColumnReader.cc index 467f8bb..58dd002 100644 --- a/c++/src/ColumnReader.cc +++ b/c++/src/ColumnReader.cc @@ -21,7 +21,7 @@ #include "Adaptor.hh" #include "ByteRLE.hh" #include "ColumnReader.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "RLE.hh" #include <math.h> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/ColumnWriter.hh ---------------------------------------------------------------------- diff --git a/c++/src/ColumnWriter.hh b/c++/src/ColumnWriter.hh index e6f076d..a471b71 100644 --- a/c++/src/ColumnWriter.hh +++ b/c++/src/ColumnWriter.hh @@ -23,7 +23,7 @@ #include "ByteRLE.hh" #include "Compression.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "Statistics.hh" #include "wrap/orc-proto-wrapper.hh" http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/Compression.cc ---------------------------------------------------------------------- diff --git a/c++/src/Compression.cc b/c++/src/Compression.cc index a28bcf0..114c559 100644 --- a/c++/src/Compression.cc +++ b/c++/src/Compression.cc @@ -18,7 +18,7 @@ #include "Adaptor.hh" #include "Compression.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "LzoDecompressor.hh" #include "lz4.h" http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/Exceptions.cc ---------------------------------------------------------------------- diff --git a/c++/src/Exceptions.cc b/c++/src/Exceptions.cc index ef6c0c2..4bcd24e 100644 --- a/c++/src/Exceptions.cc +++ b/c++/src/Exceptions.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "Exceptions.hh" +#include "orc/Exceptions.hh" namespace orc { http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/Exceptions.hh ---------------------------------------------------------------------- diff --git a/c++/src/Exceptions.hh b/c++/src/Exceptions.hh deleted file mode 100644 index 34b7818..0000000 --- a/c++/src/Exceptions.hh +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ORC_EXCEPTIONS_HH -#define ORC_EXCEPTIONS_HH - -#include "Adaptor.hh" - -#include <stdexcept> -#include <string> - -namespace orc { - - class NotImplementedYet: public std::logic_error { - public: - explicit NotImplementedYet(const std::string& what_arg); - explicit NotImplementedYet(const char* what_arg); - virtual ~NotImplementedYet() noexcept; - NotImplementedYet(const NotImplementedYet&); - private: - NotImplementedYet& operator=(const NotImplementedYet&); - }; - - class ParseError: public std::runtime_error { - public: - explicit ParseError(const std::string& what_arg); - explicit ParseError(const char* what_arg); - virtual ~ParseError() noexcept; - ParseError(const ParseError&); - private: - ParseError& operator=(const ParseError&); - }; - - class InvalidArgument: public std::runtime_error { - public: - explicit InvalidArgument(const std::string& what_arg); - explicit InvalidArgument(const char* what_arg); - virtual ~InvalidArgument() noexcept; - InvalidArgument(const InvalidArgument&); - private: - InvalidArgument& operator=(const InvalidArgument&); - }; -} - -#endif http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/LzoDecompressor.cc ---------------------------------------------------------------------- diff --git a/c++/src/LzoDecompressor.cc b/c++/src/LzoDecompressor.cc index 85b1a3b..d1ba183 100644 --- a/c++/src/LzoDecompressor.cc +++ b/c++/src/LzoDecompressor.cc @@ -14,7 +14,7 @@ #include "Adaptor.hh" #include "Compression.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include <string> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/OrcFile.cc ---------------------------------------------------------------------- diff --git a/c++/src/OrcFile.cc b/c++/src/OrcFile.cc index 2331c79..4a35d90 100644 --- a/c++/src/OrcFile.cc +++ b/c++/src/OrcFile.cc @@ -19,7 +19,7 @@ #include "orc/OrcFile.hh" #include "Adaptor.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include <errno.h> #include <fcntl.h> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/OrcHdfsFile.cc ---------------------------------------------------------------------- diff --git a/c++/src/OrcHdfsFile.cc b/c++/src/OrcHdfsFile.cc index fcfd531..8f51d5b 100644 --- a/c++/src/OrcHdfsFile.cc +++ b/c++/src/OrcHdfsFile.cc @@ -19,7 +19,7 @@ #include "orc/OrcFile.hh" #include "Adaptor.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include <errno.h> #include <fcntl.h> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/RLE.cc ---------------------------------------------------------------------- diff --git a/c++/src/RLE.cc b/c++/src/RLE.cc index f4a5402..f03c3ac 100644 --- a/c++/src/RLE.cc +++ b/c++/src/RLE.cc @@ -18,7 +18,7 @@ #include "RLEv1.hh" #include "RLEv2.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" namespace orc { http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/RLEv1.cc ---------------------------------------------------------------------- diff --git a/c++/src/RLEv1.cc b/c++/src/RLEv1.cc index 033293a..ce1af22 100644 --- a/c++/src/RLEv1.cc +++ b/c++/src/RLEv1.cc @@ -18,7 +18,7 @@ #include "Adaptor.hh" #include "Compression.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "RLEv1.hh" #include <algorithm> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/RLEv2.hh ---------------------------------------------------------------------- diff --git a/c++/src/RLEv2.hh b/c++/src/RLEv2.hh index 2923009..5b86abc 100644 --- a/c++/src/RLEv2.hh +++ b/c++/src/RLEv2.hh @@ -20,7 +20,7 @@ #define ORC_RLEV2_HH #include "Adaptor.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "RLE.hh" #include <vector> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/Reader.hh ---------------------------------------------------------------------- diff --git a/c++/src/Reader.hh b/c++/src/Reader.hh index e4e0942..b952fb9 100644 --- a/c++/src/Reader.hh +++ b/c++/src/Reader.hh @@ -24,7 +24,7 @@ #include "orc/Reader.hh" #include "ColumnReader.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "RLE.hh" #include "TypeImpl.hh" http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/Statistics.cc ---------------------------------------------------------------------- diff --git a/c++/src/Statistics.cc b/c++/src/Statistics.cc index 3bebe1d..e5e700d 100644 --- a/c++/src/Statistics.cc +++ b/c++/src/Statistics.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "RLE.hh" #include "Statistics.hh" http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/StripeStream.cc ---------------------------------------------------------------------- diff --git a/c++/src/StripeStream.cc b/c++/src/StripeStream.cc index 07ac995..75affa4 100644 --- a/c++/src/StripeStream.cc +++ b/c++/src/StripeStream.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "RLE.hh" #include "Reader.hh" #include "StripeStream.hh" http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/TypeImpl.cc ---------------------------------------------------------------------- diff --git a/c++/src/TypeImpl.cc b/c++/src/TypeImpl.cc index 6074f94..59df0ca 100644 --- a/c++/src/TypeImpl.cc +++ b/c++/src/TypeImpl.cc @@ -17,7 +17,7 @@ */ #include "Adaptor.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "TypeImpl.hh" #include <iostream> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/Vector.cc ---------------------------------------------------------------------- diff --git a/c++/src/Vector.cc b/c++/src/Vector.cc index 688855a..9e7e2d3 100644 --- a/c++/src/Vector.cc +++ b/c++/src/Vector.cc @@ -19,7 +19,7 @@ #include "orc/Vector.hh" #include "Adaptor.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include <iostream> #include <sstream> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/io/InputStream.cc ---------------------------------------------------------------------- diff --git a/c++/src/io/InputStream.cc b/c++/src/io/InputStream.cc index fd91b23..210e623 100644 --- a/c++/src/io/InputStream.cc +++ b/c++/src/io/InputStream.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "InputStream.hh" #include <algorithm> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/src/io/OutputStream.cc ---------------------------------------------------------------------- diff --git a/c++/src/io/OutputStream.cc b/c++/src/io/OutputStream.cc index 5fc8187..be8ea4f 100644 --- a/c++/src/io/OutputStream.cc +++ b/c++/src/io/OutputStream.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "OutputStream.hh" #include <sstream> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/test/TestColumnPrinter.cc ---------------------------------------------------------------------- diff --git a/c++/test/TestColumnPrinter.cc b/c++/test/TestColumnPrinter.cc index f617f3b..75930ef 100644 --- a/c++/test/TestColumnPrinter.cc +++ b/c++/test/TestColumnPrinter.cc @@ -18,7 +18,7 @@ #include "orc/ColumnPrinter.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "wrap/gtest-wrapper.h" namespace orc { http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/test/TestColumnReader.cc ---------------------------------------------------------------------- diff --git a/c++/test/TestColumnReader.cc b/c++/test/TestColumnReader.cc index d09ecca..011b04d 100644 --- a/c++/test/TestColumnReader.cc +++ b/c++/test/TestColumnReader.cc @@ -18,7 +18,7 @@ #include "Adaptor.hh" #include "ColumnReader.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "OrcTest.hh" #include "wrap/orc-proto-wrapper.hh" http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/c++/test/TestDecompression.cc ---------------------------------------------------------------------- diff --git a/c++/test/TestDecompression.cc b/c++/test/TestDecompression.cc index 181007d..5d01bde 100644 --- a/c++/test/TestDecompression.cc +++ b/c++/test/TestDecompression.cc @@ -17,7 +17,7 @@ */ #include "Compression.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include "OrcTest.hh" #include "wrap/gtest-wrapper.h" http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/tools/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt index 0fc5f64..e5126a3 100644 --- a/tools/src/CMakeLists.txt +++ b/tools/src/CMakeLists.txt @@ -10,10 +10,17 @@ # See the License for the specific language governing permissions and # limitations under the License. +# TODO: +# - orc-metadata relies on the protobuf routines, meaning protobuf and +# binary_dir/c++/src still need to be included +# - timezone-dump relies on non-public timezone routines. I *think* this +# executable can just be removed, as it looks like it was written for testing +# alone. + include_directories ( ${PROJECT_SOURCE_DIR}/c++/include - ${PROJECT_SOURCE_DIR}/c++/src ${PROJECT_BINARY_DIR}/c++/include + ${PROJECT_SOURCE_DIR}/c++/src ${PROJECT_BINARY_DIR}/c++/src ${PROTOBUF_INCLUDE_DIRS} ) @@ -26,7 +33,6 @@ add_executable (orc-contents target_link_libraries (orc-contents orc - ${PROTOBUF_LIBRARIES} ) add_executable (orc-scan @@ -35,7 +41,6 @@ add_executable (orc-scan target_link_libraries (orc-scan orc - ${PROTOBUF_LIBRARIES} ) add_executable (orc-metadata @@ -53,7 +58,6 @@ target_link_libraries (orc-metadata target_link_libraries (orc-statistics orc - ${PROTOBUF_LIBRARIES} ) add_executable (orc-memory @@ -62,7 +66,6 @@ add_executable (orc-memory target_link_libraries (orc-memory orc - ${PROTOBUF_LIBRARIES} ) add_executable (timezone-dump @@ -71,7 +74,6 @@ add_executable (timezone-dump target_link_libraries (timezone-dump orc - ${PROTOBUF_LIBRARIES} ) install(TARGETS http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/tools/src/FileContents.cc ---------------------------------------------------------------------- diff --git a/tools/src/FileContents.cc b/tools/src/FileContents.cc index 5a44525..e7bfdac 100644 --- a/tools/src/FileContents.cc +++ b/tools/src/FileContents.cc @@ -18,8 +18,7 @@ #include "orc/orc-config.hh" #include "orc/ColumnPrinter.hh" - -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include <memory> #include <string> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/tools/src/FileMemory.cc ---------------------------------------------------------------------- diff --git a/tools/src/FileMemory.cc b/tools/src/FileMemory.cc index de07e24..7298a38 100644 --- a/tools/src/FileMemory.cc +++ b/tools/src/FileMemory.cc @@ -18,7 +18,7 @@ #include "orc/orc-config.hh" #include "orc/ColumnPrinter.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include <string> #include <memory> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/tools/src/FileMetadata.cc ---------------------------------------------------------------------- diff --git a/tools/src/FileMetadata.cc b/tools/src/FileMetadata.cc index 5731662..c4784fd 100644 --- a/tools/src/FileMetadata.cc +++ b/tools/src/FileMetadata.cc @@ -24,8 +24,9 @@ #include <sstream> #include "orc/OrcFile.hh" -#include "Adaptor.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" + +//#include "Adaptor.hh" #include "wrap/orc-proto-wrapper.hh" void printStripeInformation(std::ostream& out, http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/tools/src/FileScan.cc ---------------------------------------------------------------------- diff --git a/tools/src/FileScan.cc b/tools/src/FileScan.cc index ed8f323..d91df91 100644 --- a/tools/src/FileScan.cc +++ b/tools/src/FileScan.cc @@ -18,7 +18,7 @@ #include "orc/ColumnPrinter.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include <getopt.h> #include <string> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/tools/src/FileStatistics.cc ---------------------------------------------------------------------- diff --git a/tools/src/FileStatistics.cc b/tools/src/FileStatistics.cc index 98e2f62..f8b57b3 100644 --- a/tools/src/FileStatistics.cc +++ b/tools/src/FileStatistics.cc @@ -17,7 +17,7 @@ */ #include "orc/ColumnPrinter.hh" -#include "Exceptions.hh" +#include "orc/Exceptions.hh" #include <getopt.h> #include <string> http://git-wip-us.apache.org/repos/asf/orc/blob/06a013ca/tools/src/TimezoneDump.cc ---------------------------------------------------------------------- diff --git a/tools/src/TimezoneDump.cc b/tools/src/TimezoneDump.cc index 250caf1..c4109d9 100644 --- a/tools/src/TimezoneDump.cc +++ b/tools/src/TimezoneDump.cc @@ -16,9 +16,9 @@ * limitations under the License. */ -#include "Timezone.hh" +#include "orc/Exceptions.hh" -#include "Exceptions.hh" +#include "Timezone.hh" #include <string> #include <memory>
