File tree Expand file tree Collapse file tree 1 file changed +17
-20
lines changed Expand file tree Collapse file tree 1 file changed +17
-20
lines changed Original file line number Diff line number Diff line change @@ -100,32 +100,29 @@ Version 3.0
100
100
101
101
// If the user made a choice, respect it #if !defined
102
102
#if !defined NEEDS_NULLPTR_DEFINED
103
+
103
104
// Visual Studio 2010 and higher support this
104
105
#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
110
117
#else
111
118
// 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
118
124
#endif
119
125
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
129
126
#endif
130
127
131
128
#if NEEDS_NULLPTR_DEFINED
You can’t perform that action at this time.
0 commit comments