Skip to content

Commit

Permalink
ARROW-1157: C++/Python: Decimal templates are not correctly exported …
Browse files Browse the repository at this point in the history
…on OSX

Author: Uwe L. Korn <[email protected]>

Closes apache#787 from xhochy/ARROW-1157 and squashes the following commits:

1eec942 [Uwe L. Korn] ARROW-1157: C++/Python: Decimal templates are not correctly exported on OSX
  • Loading branch information
xhochy committed Jun 27, 2017
1 parent 3e754a0 commit cb5f2b9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ci/travis_script_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ build_parquet_cpp() {
-DPARQUET_BUILD_BENCHMARKS=off \
-DPARQUET_BUILD_EXECUTABLES=off \
-DPARQUET_ZLIB_VENDORED=off \
-DPARQUET_BUILD_TESTS=off \
-DPARQUET_BUILD_TESTS=on \
..

make -j${CPU_COUNT}
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/visibility.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

// This is a complicated topic, some reading on it:
// http://www.codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/
#if defined(_MSC_VER)
#if defined(_MSC_VER) || defined(__clang__)
#define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
#else
#define ARROW_TEMPLATE_EXPORT
Expand Down

0 comments on commit cb5f2b9

Please sign in to comment.