Changeset 8367 for code/trunk/src

Timestamp:

Apr 30, 2011, 11:38:14 PM (14 years ago)

Author:

rgrieder

Message:

by Adi: Fix for GCC 4.6. The actual problem is in CEGUIString.h, but we cannot really fix that

Location:

code/trunk/src/external/ogreceguirenderer

Files:

• OgreCEGUIRenderer.cpp (modified) (1 diff)
• OgreCEGUIResourceProvider.cpp (modified) (1 diff)
• OgreCEGUITexture.cpp (modified) (1 diff)
• changes_orxonox.diff (modified) (6 diffs)

code/trunk/src/external/ogreceguirenderer/OgreCEGUIRenderer.cpp

@@ -24 +24 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *************************************************************************/
+
+// Workaround for GCC 4.6
+#include <cstddef>
 
 #include <CEGUIImagesetManager.h>

code/trunk/src/external/ogreceguirenderer/OgreCEGUIResourceProvider.cpp

@@ -24 +24 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *************************************************************************/
+
+// Workaround for GCC 4.6
+#include <cstddef>
+
 #include "OgreCEGUIResourceProvider.h"
 

code/trunk/src/external/ogreceguirenderer/OgreCEGUITexture.cpp

@@ -24 +24 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *************************************************************************/
+
+// Workaround for GCC 4.6
+#include <cstddef>
 
 #include <CEGUISystem.h>

code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff

@@ -1 @@
---- OgreCEGUIRenderer.cpp       Wed Jan 28 21:14:09 2009
-+++ OgreCEGUIRenderer.cpp       Wed Jan 28 21:07:10 2009
-@@ -24,11 +24,11 @@
+--- OgreCEGUIRenderer.cpp       Sun Dec 27 10:40:24 2009
++++ OgreCEGUIRenderer.cpp       Sat Apr 30 17:21:29 2011
+@@ -24,12 +24,15 @@
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *************************************************************************/
@@ -10 +10 @@
 -#include <CEGUI/CEGUIExceptions.h>
 -#include <CEGUI/CEGUISystem.h>
++// Workaround for GCC 4.6
++#include <cstddef>
+ 
 +#include <CEGUIImagesetManager.h>
 +#include <CEGUIImageset.h>
@@ -15 +18 @@
 +#include <CEGUIExceptions.h>
 +#include <CEGUISystem.h>
- 
++
  #include "OgreCEGUIRenderer.h"
  #include "OgreCEGUITexture.h"
+ #include "OgreCEGUIResourceProvider.h"
 --- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009
 +++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009
@@ -40 +44 @@
  #       define OGRE_GUIRENDERER_API __declspec(dllexport)
  #   else
---- OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:14:09 2009
-+++ OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:07:15 2009
-@@ -25,7 +25,7 @@
+--- OgreCEGUIResourceProvider.cpp       Sun Dec 27 10:40:24 2009
++++ OgreCEGUIResourceProvider.cpp       Sat Apr 30 17:21:40 2011
+@@ -23,9 +23,13 @@
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *************************************************************************/
++
++// Workaround for GCC 4.6
++#include <cstddef>
++
  #include "OgreCEGUIResourceProvider.h"
  
@@ -62 +72 @@
  
  // Start of CEGUI namespace section
---- OgreCEGUITexture.cpp        Wed Jan 28 21:14:09 2009
-+++ OgreCEGUITexture.cpp        Wed Jan 28 21:07:21 2009
-@@ -24,8 +24,8 @@
+--- OgreCEGUITexture.cpp        Sun Dec 27 10:40:24 2009
++++ OgreCEGUITexture.cpp        Sat Apr 30 17:21:52 2011
+@@ -24,8 +24,11 @@
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *************************************************************************/
@@ -70 +80 @@
 -#include <CEGUI/CEGUISystem.h>
 -#include <CEGUI/CEGUIExceptions.h>
++// Workaround for GCC 4.6
++#include <cstddef>
++
 +#include <CEGUISystem.h>
 +#include <CEGUIExceptions.h>