Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8367 for code/trunk


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/external/ogreceguirenderer/OgreCEGUIRenderer.cpp

    r8351 r8367  
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
     26
     27// Workaround for GCC 4.6
     28#include <cstddef>
    2629
    2730#include <CEGUIImagesetManager.h>
  • code/trunk/src/external/ogreceguirenderer/OgreCEGUIResourceProvider.cpp

    r5781 r8367  
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
     26
     27// Workaround for GCC 4.6
     28#include <cstddef>
     29
    2630#include "OgreCEGUIResourceProvider.h"
    2731
  • code/trunk/src/external/ogreceguirenderer/OgreCEGUITexture.cpp

    r5781 r8367  
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
     26
     27// Workaround for GCC 4.6
     28#include <cstddef>
    2629
    2730#include <CEGUISystem.h>
  • code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff

    r8351 r8367  
    1 --- OgreCEGUIRenderer.cpp       Wed Jan 28 21:14:09 2009
    2 +++ OgreCEGUIRenderer.cpp       Wed Jan 28 21:07:10 2009
    3 @@ -24,11 +24,11 @@
     1--- OgreCEGUIRenderer.cpp       Sun Dec 27 10:40:24 2009
     2+++ OgreCEGUIRenderer.cpp       Sat Apr 30 17:21:29 2011
     3@@ -24,12 +24,15 @@
    44     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    55 *************************************************************************/
     
    1010-#include <CEGUI/CEGUIExceptions.h>
    1111-#include <CEGUI/CEGUISystem.h>
     12+// Workaround for GCC 4.6
     13+#include <cstddef>
     14 
    1215+#include <CEGUIImagesetManager.h>
    1316+#include <CEGUIImageset.h>
     
    1518+#include <CEGUIExceptions.h>
    1619+#include <CEGUISystem.h>
    17  
     20+
    1821 #include "OgreCEGUIRenderer.h"
    1922 #include "OgreCEGUITexture.h"
     23 #include "OgreCEGUIResourceProvider.h"
    2024--- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009
    2125+++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009
     
    4044 #       define OGRE_GUIRENDERER_API __declspec(dllexport)
    4145 #   else
    42 --- OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:14:09 2009
    43 +++ OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:07:15 2009
    44 @@ -25,7 +25,7 @@
     46--- OgreCEGUIResourceProvider.cpp       Sun Dec 27 10:40:24 2009
     47+++ OgreCEGUIResourceProvider.cpp       Sat Apr 30 17:21:40 2011
     48@@ -23,9 +23,13 @@
     49     License along with this library; if not, write to the Free Software
     50     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    4551 *************************************************************************/
     52+
     53+// Workaround for GCC 4.6
     54+#include <cstddef>
     55+
    4656 #include "OgreCEGUIResourceProvider.h"
    4757 
     
    6272 
    6373 // Start of CEGUI namespace section
    64 --- OgreCEGUITexture.cpp        Wed Jan 28 21:14:09 2009
    65 +++ OgreCEGUITexture.cpp        Wed Jan 28 21:07:21 2009
    66 @@ -24,8 +24,8 @@
     74--- OgreCEGUITexture.cpp        Sun Dec 27 10:40:24 2009
     75+++ OgreCEGUITexture.cpp        Sat Apr 30 17:21:52 2011
     76@@ -24,8 +24,11 @@
    6777     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    6878 *************************************************************************/
     
    7080-#include <CEGUI/CEGUISystem.h>
    7181-#include <CEGUI/CEGUIExceptions.h>
     82+// Workaround for GCC 4.6
     83+#include <cstddef>
     84+
    7285+#include <CEGUISystem.h>
    7386+#include <CEGUIExceptions.h>
Note: See TracChangeset for help on using the changeset viewer.