Repository: parquet-cpp Updated Branches: refs/heads/master 7e1a13053 -> 52c878919
PARQUET-1029: [C++] Some extern template symbols not being exported in gcc Extern template visibility contributes to be a mystery to me, but this fixes the regression from PARQUET-991. cc @saatvikshah1994 Author: Wes McKinney <[email protected]> Closes #352 from wesm/PARQUET-1029 and squashes the following commits: 3f52852 [Wes McKinney] Some extern template symbols not being exported in gcc Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/52c87891 Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/52c87891 Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/52c87891 Branch: refs/heads/master Commit: 52c8789191c6530fe25b9dfed9d292b5836778be Parents: 7e1a130 Author: Wes McKinney <[email protected]> Authored: Wed Jun 14 10:31:14 2017 -0400 Committer: Wes McKinney <[email protected]> Committed: Wed Jun 14 10:31:14 2017 -0400 ---------------------------------------------------------------------- examples/CMakeLists.txt | 2 +- src/parquet/column/reader.h | 16 ++++++++-------- src/parquet/column/writer.h | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/52c87891/examples/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 721fa9a..594295d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -17,5 +17,5 @@ if (PARQUET_BUILD_EXECUTABLES) add_executable(reader-writer reader-writer.cc) - target_link_libraries(reader-writer parquet_static) + target_link_libraries(reader-writer parquet_shared arrow) endif() http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/52c87891/src/parquet/column/reader.h ---------------------------------------------------------------------- diff --git a/src/parquet/column/reader.h b/src/parquet/column/reader.h index f36db5e..9749e56 100644 --- a/src/parquet/column/reader.h +++ b/src/parquet/column/reader.h @@ -403,14 +403,14 @@ typedef TypedColumnReader<DoubleType> DoubleReader; typedef TypedColumnReader<ByteArrayType> ByteArrayReader; typedef TypedColumnReader<FLBAType> FixedLenByteArrayReader; -PARQUET_EXTERN_TEMPLATE TypedColumnReader<BooleanType>; -PARQUET_EXTERN_TEMPLATE TypedColumnReader<Int32Type>; -PARQUET_EXTERN_TEMPLATE TypedColumnReader<Int64Type>; -PARQUET_EXTERN_TEMPLATE TypedColumnReader<Int96Type>; -PARQUET_EXTERN_TEMPLATE TypedColumnReader<FloatType>; -PARQUET_EXTERN_TEMPLATE TypedColumnReader<DoubleType>; -PARQUET_EXTERN_TEMPLATE TypedColumnReader<ByteArrayType>; -PARQUET_EXTERN_TEMPLATE TypedColumnReader<FLBAType>; +extern template class PARQUET_EXPORT TypedColumnReader<BooleanType>; +extern template class PARQUET_EXPORT TypedColumnReader<Int32Type>; +extern template class PARQUET_EXPORT TypedColumnReader<Int64Type>; +extern template class PARQUET_EXPORT TypedColumnReader<Int96Type>; +extern template class PARQUET_EXPORT TypedColumnReader<FloatType>; +extern template class PARQUET_EXPORT TypedColumnReader<DoubleType>; +extern template class PARQUET_EXPORT TypedColumnReader<ByteArrayType>; +extern template class PARQUET_EXPORT TypedColumnReader<FLBAType>; } // namespace parquet http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/52c87891/src/parquet/column/writer.h ---------------------------------------------------------------------- diff --git a/src/parquet/column/writer.h b/src/parquet/column/writer.h index c7f9ea0..5ffcf73 100644 --- a/src/parquet/column/writer.h +++ b/src/parquet/column/writer.h @@ -212,14 +212,14 @@ typedef TypedColumnWriter<DoubleType> DoubleWriter; typedef TypedColumnWriter<ByteArrayType> ByteArrayWriter; typedef TypedColumnWriter<FLBAType> FixedLenByteArrayWriter; -PARQUET_EXTERN_TEMPLATE TypedColumnWriter<BooleanType>; -PARQUET_EXTERN_TEMPLATE TypedColumnWriter<Int32Type>; -PARQUET_EXTERN_TEMPLATE TypedColumnWriter<Int64Type>; -PARQUET_EXTERN_TEMPLATE TypedColumnWriter<Int96Type>; -PARQUET_EXTERN_TEMPLATE TypedColumnWriter<FloatType>; -PARQUET_EXTERN_TEMPLATE TypedColumnWriter<DoubleType>; -PARQUET_EXTERN_TEMPLATE TypedColumnWriter<ByteArrayType>; -PARQUET_EXTERN_TEMPLATE TypedColumnWriter<FLBAType>; +extern template class PARQUET_EXPORT TypedColumnWriter<BooleanType>; +extern template class PARQUET_EXPORT TypedColumnWriter<Int32Type>; +extern template class PARQUET_EXPORT TypedColumnWriter<Int64Type>; +extern template class PARQUET_EXPORT TypedColumnWriter<Int96Type>; +extern template class PARQUET_EXPORT TypedColumnWriter<FloatType>; +extern template class PARQUET_EXPORT TypedColumnWriter<DoubleType>; +extern template class PARQUET_EXPORT TypedColumnWriter<ByteArrayType>; +extern template class PARQUET_EXPORT TypedColumnWriter<FLBAType>; } // namespace parquet
