Skip to content

Commit d9b5c1a

Browse files
committed
Fixing up NEEDS_NULLPTR_DEFINED that got messed up when adding FreeBSD support. This caused build break on OS X and iOS.
1 parent ddea683 commit d9b5c1a

File tree

1 file changed

+17
-20
lines changed

1 file changed

+17
-20
lines changed

Release/include/compat/SafeInt3.hpp

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -100,32 +100,29 @@ Version 3.0
100100

101101
// If the user made a choice, respect it #if !defined
102102
#if !defined NEEDS_NULLPTR_DEFINED
103+
103104
// Visual Studio 2010 and higher support this
104105
#if defined(_MSC_VER)
105-
#if (_MSC_VER < 1600)
106-
#define NEEDS_NULLPTR_DEFINED 1
107-
#else
108-
#define NEEDS_NULLPTR_DEFINED 0
109-
#endif
106+
# if (_MSC_VER < 1600)
107+
# define NEEDS_NULLPTR_DEFINED 1
108+
# else
109+
# define NEEDS_NULLPTR_DEFINED 0
110+
# endif
111+
#elif defined __has_feature
112+
# if __has_feature(cxx_nullptr)
113+
# define NEEDS_NULLPTR_DEFINED 0
114+
# else
115+
# define NEEDS_NULLPTR_DEFINED 1
116+
# endif
110117
#else
111118
// Let everything else trigger based on whether we have nullptr_t
112-
#if defined nullptr_t
113-
#define NEEDS_NULLPTR_DEFINED 0
114-
#else
115-
#define NEEDS_NULLPTR_DEFINED 1
116-
#endif
117-
#endif
119+
# if defined nullptr_t
120+
# define NEEDS_NULLPTR_DEFINED 0
121+
# else
122+
# define NEEDS_NULLPTR_DEFINED 1
123+
# endif
118124
#endif
119125

120-
#ifdef __has_feature
121-
#ifdef NEEDS_NULLPTR_DEFINED
122-
#undef NEEDS_NULLPTR_DEFINED
123-
#endif
124-
#if __has_feature(cxx_nullptr)
125-
#define NEEDS_NULLPTR_DEFINED 0
126-
#else
127-
#define NEEDS_NULLPTR_DEFINED 1
128-
#endif
129126
#endif
130127

131128
#if NEEDS_NULLPTR_DEFINED

0 commit comments

Comments
 (0)