Skip to content

Add ITKCommon_EXPORT macro in the declaration of inlined Zero in NumericTraits #13

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
grizonnetm wants to merge 2 commits into from
Closed

Add ITKCommon_EXPORT macro in the declaration of inlined Zero in NumericTraits #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc09dfc
COMP: add ITKCommon_EXPORT to fix link issues with external applications
grizonnetm Apr 19, 2016
bd49c10
COMP: add ITKCommon_EXPORT for remaining integers types
grizonnetm Apr 20, 2016
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
44 changes: 22 additions & 22 deletions Modules/Core/Common/include/itkNumericTraits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ class NumericTraits< char > :public std::numeric_limits< char >
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR char Zero = 0;
static ITK_CONSTEXPR char One = 1;
static ITK_CONSTEXPR char ITKCommon_EXPORT Zero = 0;
static ITK_CONSTEXPR char ITKCommon_EXPORT One = 1;

static ITK_CONSTEXPR_FUNC char min() { return char(255) < char(0) ? char(-128) : char(0); }
static ITK_CONSTEXPR_FUNC char max() { return char(255) < char(0) ? char(127) : char(255); }
Expand Down Expand Up @@ -366,8 +366,8 @@ class NumericTraits< signed char > :public std::numeric_limits< signed char >
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR signed char Zero = 0;
static ITK_CONSTEXPR signed char One = 1;
static ITK_CONSTEXPR signed char ITKCommon_EXPORT Zero = 0;
static ITK_CONSTEXPR signed char ITKCommon_EXPORT One = 1;

static ITK_CONSTEXPR_FUNC signed char min() { return -128; }
static ITK_CONSTEXPR_FUNC signed char max() { return 127; }
Expand Down Expand Up @@ -422,8 +422,8 @@ class NumericTraits< unsigned char > :public std::numeric_limits< unsigned char
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR unsigned char Zero = 0;
static ITK_CONSTEXPR unsigned char One = 1;
static ITK_CONSTEXPR unsigned char ITKCommon_EXPORT Zero = 0;
static ITK_CONSTEXPR unsigned char ITKCommon_EXPORT One = 1;

itkNUMERIC_TRAITS_MIN_MAX_MACRO();

Expand Down Expand Up @@ -475,8 +475,8 @@ class NumericTraits< short > :public std::numeric_limits< short >
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR short Zero = 0;
static ITK_CONSTEXPR short One = 1;
static ITK_CONSTEXPR short ITKCommon_EXPORT Zero = 0;
static ITK_CONSTEXPR short ITKCommon_EXPORT One = 1;

itkNUMERIC_TRAITS_MIN_MAX_MACRO();
static ITK_CONSTEXPR_FUNC short NonpositiveMin() { return std::numeric_limits< ValueType >::min(); }
Expand Down Expand Up @@ -528,8 +528,8 @@ class NumericTraits< unsigned short > :public std::numeric_limits< unsigned shor
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR unsigned short Zero = 0;
static ITK_CONSTEXPR unsigned short One = 1;
static ITK_CONSTEXPR unsigned short ITKCommon_EXPORT Zero = 0;
static ITK_CONSTEXPR unsigned short ITKCommon_EXPORT One = 1;

itkNUMERIC_TRAITS_MIN_MAX_MACRO();
static ITK_CONSTEXPR_FUNC unsigned short NonpositiveMin() { return std::numeric_limits< ValueType >::min(); }
Expand Down Expand Up @@ -580,8 +580,8 @@ class NumericTraits< int > :public std::numeric_limits< int >
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR int Zero = 0;
static ITK_CONSTEXPR int One = 1;
static ITK_CONSTEXPR int ITKCommon_EXPORT Zero = 0;
static ITK_CONSTEXPR int ITKCommon_EXPORT One = 1;

itkNUMERIC_TRAITS_MIN_MAX_MACRO();
static ITK_CONSTEXPR_FUNC int NonpositiveMin() { return std::numeric_limits< ValueType >::min(); }
Expand Down Expand Up @@ -633,8 +633,8 @@ class NumericTraits< unsigned int > :public std::numeric_limits< unsigned int >
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR unsigned int Zero = 0;
static ITK_CONSTEXPR unsigned int One = 1;
static ITK_CONSTEXPR unsigned int ITKCommon_EXPORT Zero = 0;
static ITK_CONSTEXPR unsigned int ITKCommon_EXPORT One = 1;

static ITK_CONSTEXPR_FUNC unsigned int min(void) { return 0; }
static ITK_CONSTEXPR_FUNC unsigned int max(void) { return static_cast< unsigned int >( -1 ); }
Expand Down Expand Up @@ -689,8 +689,8 @@ class NumericTraits< long > :public std::numeric_limits< long >
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR long Zero = 0L;
static ITK_CONSTEXPR long One = 1L;
static ITK_CONSTEXPR long ITKCommon_EXPORT Zero = 0L;
static ITK_CONSTEXPR long ITKCommon_EXPORT One = 1L;

itkNUMERIC_TRAITS_MIN_MAX_MACRO();
static ITK_CONSTEXPR_FUNC long NonpositiveMin() { return std::numeric_limits< ValueType >::min(); }
Expand Down Expand Up @@ -742,8 +742,8 @@ class NumericTraits< unsigned long > :public std::numeric_limits< unsigned long
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR unsigned long Zero = 0UL;
static ITK_CONSTEXPR unsigned long One = 1UL;
static ITK_CONSTEXPR unsigned long ITKCommon_EXPORT Zero = 0UL;
static ITK_CONSTEXPR unsigned long ITKCommon_EXPORT One = 1UL;

itkNUMERIC_TRAITS_MIN_MAX_MACRO();
static ITK_CONSTEXPR_FUNC unsigned long NonpositiveMin() { return std::numeric_limits< ValueType >::min(); }
Expand Down Expand Up @@ -965,8 +965,8 @@ class NumericTraits< long long > :
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR ValueType Zero = 0LL;
static ITK_CONSTEXPR ValueType One = 1LL;
static ITK_CONSTEXPR ValueType ITKCommon_EXPORT Zero = 0LL;
static ITK_CONSTEXPR ValueType ITKCommon_EXPORT One = 1LL;

itkNUMERIC_TRAITS_MIN_MAX_MACRO();
static ITK_CONSTEXPR_FUNC ValueType NonpositiveMin() { return std::numeric_limits< ValueType >::min(); }
Expand Down Expand Up @@ -1019,8 +1019,8 @@ class NumericTraits< unsigned long long > :
typedef float FloatType;
typedef FixedArray<ValueType, 1> MeasurementVectorType;

static ITK_CONSTEXPR ValueType Zero = 0ULL;
static ITK_CONSTEXPR ValueType One = 1ULL;
static ITK_CONSTEXPR ValueType ITKCommon_EXPORT Zero = 0ULL;
static ITK_CONSTEXPR ValueType ITKCommon_EXPORT One = 1ULL;

itkNUMERIC_TRAITS_MIN_MAX_MACRO();
static ITK_CONSTEXPR_FUNC ValueType NonpositiveMin() { return std::numeric_limits< ValueType >::min(); }
Expand Down