Advertisement
Guest User

Untitled

a guest
Jul 7th, 2015
207
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.89 KB | None | 0 0
  1. diff --git a/externals/ovr/Src/Kernel/OVR_Compiler.h b/externals/ovr/Src/Kernel/OVR_Compiler.h
  2. index 93a4181..058d3c7 100644
  3. --- a/externals/ovr/Src/Kernel/OVR_Compiler.h
  4. +++ b/externals/ovr/Src/Kernel/OVR_Compiler.h
  5. @@ -485,15 +485,15 @@ limitations under the License.
  6. // OVR_Nullptr.h provides a portable nullptr and std::nullptr_t for when the
  7. // compiler or standard library do not.
  8.  
  9. -#if !defined(OVR_CPP_NO_NULLPTR)
  10. - #if !defined(OVR_CPP11_ENABLED) || \
  11. - (!(defined(__clang__) && OVR_CC_HAS_FEATURE(cxx_nullptr)) /* clang */ && \
  12. - !(defined(__GNUC__) && (OVR_CC_VERSION >= 406)) /* GCC 4.6+ */ && \
  13. - !(defined(_MSC_VER) && (_MSC_VER >= 1600)) /* VS2010+ */ && \
  14. - !(defined(__EDG_VERSION__) && (__EDG_VERSION__ >= 403))) /* EDG 4.3+ */
  15. - #define OVR_CPP_NO_NULLPTR 1
  16. - #endif
  17. -#endif
  18. +//#if !defined(OVR_CPP_NO_NULLPTR)
  19. +// #if !defined(OVR_CPP11_ENABLED) || \
  20. +// (!(defined(__clang__) && OVR_CC_HAS_FEATURE(cxx_nullptr)) /* clang */ && \
  21. +// !(defined(__GNUC__) && (OVR_CC_VERSION >= 406)) /* GCC 4.6+ */ && \
  22. +// !(defined(_MSC_VER) && (_MSC_VER >= 1600)) /* VS2010+ */ && \
  23. +// !(defined(__EDG_VERSION__) && (__EDG_VERSION__ >= 403))) /* EDG 4.3+ */
  24. +// #define OVR_CPP_NO_NULLPTR 1
  25. +// #endif
  26. +//#endif
  27.  
  28.  
  29. //-----------------------------------------------------------------------------------
  30. diff --git a/externals/ovr/Src/Kernel/OVR_Nullptr.h b/externals/ovr/Src/Kernel/OVR_Nullptr.h
  31. index a09f446..a1aa1ee 100644
  32. --- a/externals/ovr/Src/Kernel/OVR_Nullptr.h
  33. +++ b/externals/ovr/Src/Kernel/OVR_Nullptr.h
  34. @@ -32,6 +32,8 @@ limitations under the License.
  35.  
  36. #include "OVR_Types.h"
  37.  
  38. +#define OVR_HAVE_std_nullptr_t 1
  39. +
  40.  
  41. //-----------------------------------------------------------------------------------
  42. // ***** OVR_HAVE_std_nullptr_t
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement