Skip to content

ARROW-627: [C++] Add compatibility macros for exported extern templates #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 3 commits into from
Closed

ARROW-627: [C++] Add compatibility macros for exported extern templates #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a9fcb4
Add compatibility macros for exported extern templates, also to reduc…
wesm Mar 28, 2017
b53a400
MSVC needs export annotation when instantiating templates
wesm Mar 28, 2017
3f6277d
Wrong define for msvc
wesm Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions cpp/src/arrow/array.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,21 +445,21 @@ Status Array::Accept(ArrayVisitor* visitor) const {
// ----------------------------------------------------------------------
// Instantiate templates

template class NumericArray<UInt8Type>;
template class NumericArray<UInt16Type>;
template class NumericArray<UInt32Type>;
template class NumericArray<UInt64Type>;
template class NumericArray<Int8Type>;
template class NumericArray<Int16Type>;
template class NumericArray<Int32Type>;
template class NumericArray<Int64Type>;
template class NumericArray<TimestampType>;
template class NumericArray<Date32Type>;
template class NumericArray<Date64Type>;
template class NumericArray<Time32Type>;
template class NumericArray<Time64Type>;
template class NumericArray<HalfFloatType>;
template class NumericArray<FloatType>;
template class NumericArray<DoubleType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<TimestampType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<DoubleType>;

} // namespace arrow
43 changes: 16 additions & 27 deletions cpp/src/arrow/array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,34 +483,23 @@ class ARROW_EXPORT DictionaryArray : public Array {
// ----------------------------------------------------------------------
// extern templates and other details

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wattributes"
#endif

// Only instantiate these templates once
extern template class ARROW_EXPORT NumericArray<Int8Type>;
extern template class ARROW_EXPORT NumericArray<UInt8Type>;
extern template class ARROW_EXPORT NumericArray<Int16Type>;
extern template class ARROW_EXPORT NumericArray<UInt16Type>;
extern template class ARROW_EXPORT NumericArray<Int32Type>;
extern template class ARROW_EXPORT NumericArray<UInt32Type>;
extern template class ARROW_EXPORT NumericArray<Int64Type>;
extern template class ARROW_EXPORT NumericArray<UInt64Type>;
extern template class ARROW_EXPORT NumericArray<HalfFloatType>;
extern template class ARROW_EXPORT NumericArray<FloatType>;
extern template class ARROW_EXPORT NumericArray<DoubleType>;
extern template class ARROW_EXPORT NumericArray<Date32Type>;
extern template class ARROW_EXPORT NumericArray<Date64Type>;
extern template class ARROW_EXPORT NumericArray<Time32Type>;
extern template class ARROW_EXPORT NumericArray<Time64Type>;
extern template class ARROW_EXPORT NumericArray<TimestampType>;

#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic pop
#endif
ARROW_EXTERN_TEMPLATE NumericArray<Int8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<HalfFloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<FloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<DoubleType>;
ARROW_EXTERN_TEMPLATE NumericArray<Date32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Date64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<TimestampType>;

} // namespace arrow

Expand Down
22 changes: 11 additions & 11 deletions cpp/src/arrow/tensor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,16 @@ NumericTensor<T>::NumericTensor(const std::shared_ptr<Buffer>& data,
const std::vector<int64_t>& shape, const std::vector<int64_t>& strides)
: NumericTensor(data, shape, strides, {}) {}

template class NumericTensor<Int8Type>;
template class NumericTensor<UInt8Type>;
template class NumericTensor<Int16Type>;
template class NumericTensor<UInt16Type>;
template class NumericTensor<Int32Type>;
template class NumericTensor<UInt32Type>;
template class NumericTensor<Int64Type>;
template class NumericTensor<UInt64Type>;
template class NumericTensor<HalfFloatType>;
template class NumericTensor<FloatType>;
template class NumericTensor<DoubleType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<DoubleType>;

} // namespace arrow
33 changes: 11 additions & 22 deletions cpp/src/arrow/tensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,29 +129,18 @@ class ARROW_EXPORT NumericTensor : public Tensor {
// ----------------------------------------------------------------------
// extern templates and other details

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wattributes"
#endif

// Only instantiate these templates once
extern template class ARROW_EXPORT NumericTensor<Int8Type>;
extern template class ARROW_EXPORT NumericTensor<UInt8Type>;
extern template class ARROW_EXPORT NumericTensor<Int16Type>;
extern template class ARROW_EXPORT NumericTensor<UInt16Type>;
extern template class ARROW_EXPORT NumericTensor<Int32Type>;
extern template class ARROW_EXPORT NumericTensor<UInt32Type>;
extern template class ARROW_EXPORT NumericTensor<Int64Type>;
extern template class ARROW_EXPORT NumericTensor<UInt64Type>;
extern template class ARROW_EXPORT NumericTensor<HalfFloatType>;
extern template class ARROW_EXPORT NumericTensor<FloatType>;
extern template class ARROW_EXPORT NumericTensor<DoubleType>;

#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic pop
#endif
ARROW_EXTERN_TEMPLATE NumericTensor<Int8Type>;
ARROW_EXTERN_TEMPLATE NumericTensor<UInt8Type>;
ARROW_EXTERN_TEMPLATE NumericTensor<Int16Type>;
ARROW_EXTERN_TEMPLATE NumericTensor<UInt16Type>;
ARROW_EXTERN_TEMPLATE NumericTensor<Int32Type>;
ARROW_EXTERN_TEMPLATE NumericTensor<UInt32Type>;
ARROW_EXTERN_TEMPLATE NumericTensor<Int64Type>;
ARROW_EXTERN_TEMPLATE NumericTensor<UInt64Type>;
ARROW_EXTERN_TEMPLATE NumericTensor<HalfFloatType>;
ARROW_EXTERN_TEMPLATE NumericTensor<FloatType>;
ARROW_EXTERN_TEMPLATE NumericTensor<DoubleType>;

} // namespace arrow

Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ struct ARROW_EXPORT UnionType : public NestedType {

enum class DateUnit : char { DAY = 0, MILLI = 1 };

struct DateType : public FixedWidthType {
struct ARROW_EXPORT DateType : public FixedWidthType {
public:
DateUnit unit;

Expand Down Expand Up @@ -496,7 +496,7 @@ static inline std::ostream& operator<<(std::ostream& os, TimeUnit unit) {
return os;
}

struct TimeType : public FixedWidthType {
struct ARROW_EXPORT TimeType : public FixedWidthType {
public:
TimeUnit unit;

Expand Down
17 changes: 17 additions & 0 deletions cpp/src/arrow/util/visibility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,21 @@
#endif
#endif // Non-Windows

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815

#if defined(__clang__)
#define ARROW_EXTERN_TEMPLATE extern template class ARROW_EXPORT
#else
#define ARROW_EXTERN_TEMPLATE extern template class
#endif

// 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)
#define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
#else
#define ARROW_TEMPLATE_EXPORT
#endif

#endif // ARROW_UTIL_VISIBILITY_H