ogremainincludes.patch

使用stl技术,(还没看,是听说的)

diff -Naur 014/OgreCamera.h py014/OgreCamera.h
--- 014/OgreCamera.h	Wed May 12 01:29:30 2004
+++ py014/OgreCamera.h	Wed Jun 30 07:49:53 2004
@@ -408,8 +408,9 @@
         SceneNode* getAutoTrackTarget(void) { return mAutoTrackTarget; }
 		/** Get the auto tracking offset for this camera, if it is auto tracking. */
 		const Vector3& getAutoTrackOffset(void) const { return mAutoTrackOffset; }
-		
 
+    private:
+       Camera( const Camera &other );
     };
 
 } // namespace Ogre
diff -Naur 014/OgreEventProcessor.h py014/OgreEventProcessor.h
--- 014/OgreEventProcessor.h	Sat May  8 00:15:04 2004
+++ py014/OgreEventProcessor.h	Thu Jul  8 21:41:43 2004
@@ -219,6 +219,10 @@
         preventing link errors.
         */
         static EventProcessor* getSingletonPtr(void);
+
+    private:
+       EventProcessor( const EventProcessor &other );
+       void operator =( const EventProcessor &other );
     };
 
 
diff -Naur 014/OgreFrameListener.h py014/OgreFrameListener.h
--- 014/OgreFrameListener.h	Sat Jan  3 15:51:59 2004
+++ py014/OgreFrameListener.h	Fri Jul  9 07:20:03 2004
@@ -94,8 +94,15 @@
         */
         virtual bool frameEnded(const FrameEvent& evt) { return true; }
 
+      FrameListener()
+      {
+      }
+
 		virtual ~FrameListener() {}
-		
+
+    private:
+       FrameListener( const FrameListener &other );
+       void operator =( const FrameListener &other );
     };
 }
 
diff -Naur 014/OgreFrustum.h py014/OgreFrustum.h
--- 014/OgreFrustum.h	Wed May 12 01:29:31 2004
+++ py014/OgreFrustum.h	Thu Jul  8 20:31:46 2004
@@ -59,6 +59,10 @@
     */
     class _OgreExport Frustum : public MovableObject, public Renderable
     {
+    private:
+       Frustum( const Frustum &other );
+       void operator =( const Frustum &other );
+
     protected:
         /// Orthographic or perspective?
         ProjectionType mProjType;
@@ -322,7 +326,7 @@
             top-left near, bottom-left near, bottom-right near, 
             top-right far, top-left far, bottom-left far, bottom-right far.
         */
-        virtual const Vector3* getWorldSpaceCorners(void) const;
+        virtual const Vector3 *getWorldSpaceCorners(void) const;
 
         /** Sets the type of projection to use (orthographic or perspective). Default is perspective.
         */
diff -Naur 014/OgreGuiManager.h py014/OgreGuiManager.h
--- 014/OgreGuiManager.h	Sat May  8 00:15:04 2004
+++ py014/OgreGuiManager.h	Sat Jul 10 11:47:59 2004
@@ -29,6 +29,7 @@
 #include "OgrePrerequisites.h"
 #include "OgreSingleton.h"
 #include "OgreIteratorWrappers.h"
+#include "OgreString.h"
 
 namespace Ogre {
 
diff -Naur 014/OgreIteratorWrappers.h py014/OgreIteratorWrappers.h
--- 014/OgreIteratorWrappers.h	Wed May 12 01:29:31 2004
+++ py014/OgreIteratorWrappers.h	Thu Jul  1 18:48:22 2004
@@ -52,6 +52,8 @@
 		/// Private constructor since only the parameterised constructor should be used
         VectorIterator() {};
     public:
+        typedef typename T::value_type ValueType;
+
         /** Constructor.
         @remarks
             Provide a start and end iterator to initialise.
@@ -115,6 +117,9 @@
         /// Private constructor since only the parameterised constructor should be used
         MapIterator() {};
     public:
+        typedef typename T::mapped_type MappedType;
+        typedef typename T::key_type KeyType;
+
         /** Constructor.
         @remarks
             Provide a start and end iterator to initialise.
@@ -190,6 +195,8 @@
         /// Private constructor since only the parameterised constructor should be used
         ConstVectorIterator() {};
     public:
+        typedef typename T::value_type ValueType;
+
         /** Constructor.
         @remarks
         Provide a start and end iterator to initialise.
@@ -253,6 +260,9 @@
         /// Private constructor since only the parameterised constructor should be used
         ConstMapIterator() {};
     public:
+        typedef typename T::mapped_type MappedType;
+        typedef typename T::key_type KeyType;
+
         /** Constructor.
         @remarks
         Provide a start and end iterator to initialise.
diff -Naur 014/OgreOverlay.h py014/OgreOverlay.h
--- 014/OgreOverlay.h	Fri Mar  5 03:09:54 2004
+++ py014/OgreOverlay.h	Sat Jul 10 11:06:15 2004
@@ -246,6 +246,9 @@
             return Overlay2DElementsIterator (m2DElements.begin(), m2DElements.end());
         }
 
+    private:
+       Overlay( const Overlay &other );
+       void operator =( const Overlay &other );
     };
 
 
diff -Naur 014/OgreParticleSystemManager.h py014/OgreParticleSystemManager.h
--- 014/OgreParticleSystemManager.h	Sat May  8 00:15:04 2004
+++ py014/OgreParticleSystemManager.h	Sat Jul 10 13:42:33 2004
@@ -339,6 +339,9 @@
         */
         static ParticleSystemManager* getSingletonPtr(void);
 
+     private:
+        ParticleSystemManager( const ParticleSystemManager &other );
+        void operator =( const ParticleSystemManager &other );
     };
 
 }
diff -Naur 014/OgrePlatform.h py014/OgrePlatform.h
--- 014/OgrePlatform.h	Sat May  1 22:18:27 2004
+++ py014/OgrePlatform.h	Tue Jun 29 07:58:42 2004
@@ -99,6 +99,10 @@
 #       define _OgreExport __declspec( dllimport )
 #   endif
 
+#   if defined( GCCXML )
+#       define _OgreExport
+#   endif
+
 // Win32 compilers use _DEBUG for specifying debug builds.
 #   ifdef _DEBUG
 #       define OGRE_DEBUG_MODE 1
diff -Naur 014/OgrePredefinedControllers.h py014/OgrePredefinedControllers.h
--- 014/OgrePredefinedControllers.h	Sat Mar  6 19:23:32 2004
+++ py014/OgrePredefinedControllers.h	Wed Jul 14 17:34:49 2004
@@ -41,9 +41,12 @@
     */
     class _OgreExport FrameTimeControllerValue : public ControllerValue<Real>, public FrameListener
     {
+    private:
+       FrameTimeControllerValue( const FrameTimeControllerValue &other );
+       void operator =( const FrameTimeControllerValue &other );
     protected:
         Real mFrameTime;
-		Real mTimeFactor;
+		  Real mTimeFactor;
 
     public:
         FrameTimeControllerValue();
diff -Naur 014/OgreQuaternion.h py014/OgreQuaternion.h
--- 014/OgreQuaternion.h	Wed May 12 01:29:31 2004
+++ py014/OgreQuaternion.h	Mon Aug  2 06:29:49 2004
@@ -112,8 +112,12 @@
         Quaternion operator- (const Quaternion& rkQ) const;
         Quaternion operator* (const Quaternion& rkQ) const;
         Quaternion operator* (Real fScalar) const;
-        friend Quaternion operator* (Real fScalar,
-            const Quaternion& rkQ);
+
+        inline friend Quaternion operator* ( Real fScalar, const Quaternion& rkQ )
+        {
+            return rkQ * fScalar;
+        }
+        
         Quaternion operator- () const;
         inline bool operator== (const Quaternion& rhs) const
 		{
diff -Naur 014/OgreRenderQueueSortingGrouping.h py014/OgreRenderQueueSortingGrouping.h
--- 014/OgreRenderQueueSortingGrouping.h	Wed May 12 01:29:31 2004
+++ py014/OgreRenderQueueSortingGrouping.h	Wed Jun 30 07:51:00 2004
@@ -49,6 +49,7 @@
     */
     class RenderPriorityGroup
     {
+    public:
         /** Internal struct reflecting a single Pass for a Renderable. 
         This is used to sort transparent objects.
         */
diff -Naur 014/OgreSubEntity.h py014/OgreSubEntity.h
--- 014/OgreSubEntity.h	Wed May 12 01:29:32 2004
+++ py014/OgreSubEntity.h	Wed Jul 14 00:43:39 2004
@@ -51,6 +51,10 @@
     */
     class _OgreExport SubEntity: public Renderable
     {
+    private:
+       SubEntity( const SubEntity &other );
+       void operator =( const SubEntity &other );
+
         // Note no virtual functions for efficiency
         friend class Entity;
         friend class SceneManager;