|
Line 0
Link Here
|
|
|
1 |
--- MyGUIEngine/include/MyGUI_Prerequest.h.orig 2017-11-29 16:23:51 UTC |
| 2 |
+++ MyGUIEngine/include/MyGUI_Prerequest.h |
| 3 |
@@ -18,18 +18,6 @@ |
| 4 |
|
| 5 |
#define MYGUI_DEFINE_VERSION(major, minor, patch) ((major << 16) | (minor << 8) | patch) |
| 6 |
|
| 7 |
-#ifndef MYGUI_DONT_REPLACE_NULLPTR |
| 8 |
-# if MYGUI_COMPILER == MYGUI_COMPILER_MSVC |
| 9 |
-# ifndef _MANAGED |
| 10 |
-# ifndef _NATIVE_NULLPTR_SUPPORTED |
| 11 |
-# define nullptr 0 |
| 12 |
-# endif |
| 13 |
-# endif |
| 14 |
-# else |
| 15 |
-# define nullptr 0 |
| 16 |
-# endif |
| 17 |
-#endif |
| 18 |
- |
| 19 |
namespace MyGUI |
| 20 |
{ |
| 21 |
class Gui; |