Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/externals/ovr/Src/Kernel/OVR_Compiler.h b/externals/ovr/Src/Kernel/OVR_Compiler.h
- index 93a4181..058d3c7 100644
- --- a/externals/ovr/Src/Kernel/OVR_Compiler.h
- +++ b/externals/ovr/Src/Kernel/OVR_Compiler.h
- @@ -485,15 +485,15 @@ limitations under the License.
- // OVR_Nullptr.h provides a portable nullptr and std::nullptr_t for when the
- // compiler or standard library do not.
- -#if !defined(OVR_CPP_NO_NULLPTR)
- - #if !defined(OVR_CPP11_ENABLED) || \
- - (!(defined(__clang__) && OVR_CC_HAS_FEATURE(cxx_nullptr)) /* clang */ && \
- - !(defined(__GNUC__) && (OVR_CC_VERSION >= 406)) /* GCC 4.6+ */ && \
- - !(defined(_MSC_VER) && (_MSC_VER >= 1600)) /* VS2010+ */ && \
- - !(defined(__EDG_VERSION__) && (__EDG_VERSION__ >= 403))) /* EDG 4.3+ */
- - #define OVR_CPP_NO_NULLPTR 1
- - #endif
- -#endif
- +//#if !defined(OVR_CPP_NO_NULLPTR)
- +// #if !defined(OVR_CPP11_ENABLED) || \
- +// (!(defined(__clang__) && OVR_CC_HAS_FEATURE(cxx_nullptr)) /* clang */ && \
- +// !(defined(__GNUC__) && (OVR_CC_VERSION >= 406)) /* GCC 4.6+ */ && \
- +// !(defined(_MSC_VER) && (_MSC_VER >= 1600)) /* VS2010+ */ && \
- +// !(defined(__EDG_VERSION__) && (__EDG_VERSION__ >= 403))) /* EDG 4.3+ */
- +// #define OVR_CPP_NO_NULLPTR 1
- +// #endif
- +//#endif
- //-----------------------------------------------------------------------------------
- diff --git a/externals/ovr/Src/Kernel/OVR_Nullptr.h b/externals/ovr/Src/Kernel/OVR_Nullptr.h
- index a09f446..a1aa1ee 100644
- --- a/externals/ovr/Src/Kernel/OVR_Nullptr.h
- +++ b/externals/ovr/Src/Kernel/OVR_Nullptr.h
- @@ -32,6 +32,8 @@ limitations under the License.
- #include "OVR_Types.h"
- +#define OVR_HAVE_std_nullptr_t 1
- +
- //-----------------------------------------------------------------------------------
- // ***** OVR_HAVE_std_nullptr_t
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement