[Python-ogre-commit] SF.net SVN: python-ogre:[795] trunk/python-ogre/patch/ogre_1.6.0.patch

[<and...@us...>]

Revision: 795
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=795&view=rev
Author:   andy_miller
Date:     2008-11-16 22:50:41 +0000 (Sun, 16 Nov 2008)

Log Message:
-----------
Updated patch for Linxu - force GCC to <4.3.0

Modified Paths:
--------------
    trunk/python-ogre/patch/ogre_1.6.0.patch

Modified: trunk/python-ogre/patch/ogre_1.6.0.patch
===================================================================
--- trunk/python-ogre/patch/ogre_1.6.0.patch	2008-11-16 22:49:25 UTC (rev 794)
+++ trunk/python-ogre/patch/ogre_1.6.0.patch	2008-11-16 22:50:41 UTC (rev 795)
@@ -165,24 +165,42 @@
  
  #undef NOMINMAX
  #define NOMINMAX
-Index: ogre/ReferenceApplication/ReferenceAppLayer/OgreRefAppWorld.cpp
+Index: ogre/OgreMain/include/OgreStdHeaders.h
 ===================================================================
---- ogre/ReferenceApplication/ReferenceAppLayer/OgreRefAppWorld.cpp (revision 8151)
-+++ ogre/ReferenceApplication/ReferenceAppLayer/OgreRefAppWorld.cpp (working copy)
-@@ -54,6 +54,8 @@
-         mSimulationStepSize = 0.01f;
-
-         // Create the dynamics world
-+               dInitODE2(0);
-+
-         mOdeWorld = new dWorld();
-         mOdeContactGroup = new dJointGroup();
-
-@@ -79,6 +81,7 @@
-         // Destroy dynamix world
-                delete mOdeContactGroup;
-         delete mOdeWorld;
-+        dCloseODE();
-
-     }
-     //-------------------------------------------------------------------------
\ No newline at end of file
+--- ogre/OgreMain/include/OgreStdHeaders.h	(revision 8145)
++++ ogre/OgreMain/include/OgreStdHeaders.h	(working copy)
+@@ -36,7 +36,7 @@
+ // Note - not in the original STL, but exists in SGI STL and STLport
+ // For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
+ #if (OGRE_COMPILER == OGRE_COMPILER_GNUC) && !defined(STLPORT)
+-#   if OGRE_COMP_VER >= 430
++#   if OGRE_COMP_VER >= 430 && !(defined __PYTHONOGRE_BUILD_CODE)
+ #       include <tr1/unordered_map>
+ #       include <tr1/unordered_set> 
+ #   else
+Index: ogre/OgreMain/include/OgrePrerequisites.h
+===================================================================
+--- ogre/OgreMain/include/OgrePrerequisites.h	(revision 8145)
++++ ogre/OgreMain/include/OgrePrerequisites.h	(working copy)
+@@ -121,7 +121,7 @@
+     #endif
+ 
+     #if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
+-	#   if OGRE_COMP_VER >= 430
++	#   if OGRE_COMP_VER >= 430 && !defined(__PYTHONOGRE_BUILD_CODE)
+ 	#       define HashMap ::std::tr1::unordered_map
+ 	#		define HashSet ::std::tr1::unordered_set
+ 	#    else
+Index: ogre/OgreMain/include/OgreString.h
+===================================================================
+--- ogre/OgreMain/include/OgreString.h	(revision 8145)
++++ ogre/OgreMain/include/OgreString.h	(working copy)
+@@ -158,7 +158,7 @@
+ 
+ 
+ #if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
+-#   if OGRE_COMP_VER < 430
++#   if OGRE_COMP_VER < 430 || defined (__PYTHONOGRE_BUILD_CODE)
+ 	typedef ::__gnu_cxx::hash< _StringBase > _StringHash;
+ #   else
+ 	typedef ::std::tr1::hash< _StringBase > _StringHash;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.