Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-02-23 13:40:10 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-02-23 13:40:10 +0400
commitd881bb4b32d1dff089b6f8c61d0f0fdd16d2b82b (patch)
tree9bbbb4dff81ea59ddc2daf386e851f8ac2588d0b /source/gameengine
parent09ee59c669dfa51bab22fe2552d619763a8c98a3 (diff)
BGE is compilable by MSVC again
Compilation error was mostly caused by trying to use namespace std before it was actually defined (e.g. before any include of stl header). It's not actually good idea to use namespaces in header files -- it's really easy to run into namespace conflicts and so. Resolved by not using "using namespace" in header files and using full quality accessing to stl collections (e.g. std::vector).
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/GameLogic/SCA_IScene.h2
-rw-r--r--source/gameengine/Ketsji/KX_Scene.h10
-rw-r--r--source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp2
-rw-r--r--source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h4
-rw-r--r--source/gameengine/Rasterizer/RAS_2DFilterManager.h6
-rw-r--r--source/gameengine/Rasterizer/RAS_ICanvas.h2
6 files changed, 12 insertions, 14 deletions
diff --git a/source/gameengine/GameLogic/SCA_IScene.h b/source/gameengine/GameLogic/SCA_IScene.h
index 78dd3f7183f..6f048b77acf 100644
--- a/source/gameengine/GameLogic/SCA_IScene.h
+++ b/source/gameengine/GameLogic/SCA_IScene.h
@@ -68,7 +68,7 @@ public:
void AddDebugProperty(class CValue* debugprop,
const STR_String &name);
void RemoveAllDebugProperties();
- virtual void Update2DFilter(vector<STR_String>& propNames, void* gameObj,
+ virtual void Update2DFilter(std::vector<STR_String>& propNames, void* gameObj,
RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode,
int pass, STR_String& text) {}
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index c3e6fa376dd..8fcfe46e643 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -140,12 +140,12 @@ protected:
/**
* The set of cameras for this scene
*/
- list<class KX_Camera*> m_cameras;
+ std::list<class KX_Camera*> m_cameras;
/**
* The set of fonts for this scene
*/
- list<class KX_FontObject*> m_fonts;
+ std::list<class KX_FontObject*> m_fonts;
/**
@@ -383,7 +383,7 @@ public:
/** Font Routines */
- list<class KX_FontObject*>*
+ std::list<class KX_FontObject*>*
GetFonts(
);
@@ -402,7 +402,7 @@ public:
/** Camera Routines */
- list<class KX_Camera*>*
+ std::list<class KX_Camera*>*
GetCameras(
);
@@ -584,7 +584,7 @@ public:
/**
* 2D Filters
*/
- void Update2DFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
+ void Update2DFilter(std::vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
void Render2DFilters(RAS_ICanvas* canvas);
KX_ObstacleSimulation* GetObstacleSimulation() {return m_obstacleSimulation;};
diff --git a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
index 0dc468a3e98..c57bd304ca2 100644
--- a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
+++ b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
@@ -34,6 +34,8 @@
#include "NG_LoopBackNetworkDeviceInterface.h"
#include "NG_NetworkMessage.h"
+using namespace std;
+
// temporary debugging printf's
#ifdef NAN_NET_DEBUG
#include <stdio.h>
diff --git a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
index 729db794dcf..968d56b2473 100644
--- a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
+++ b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
@@ -32,8 +32,6 @@
#ifndef NG_LOOPBACKNETWORKDEVICEINTERFACE_H
#define NG_LOOPBACKNETWORKDEVICEINTERFACE_H
-using namespace std;
-
#include <deque>
#include "NG_NetworkDeviceInterface.h"
@@ -57,7 +55,7 @@ public:
bool Disconnect(void) {return true;}
virtual void SendNetworkMessage(class NG_NetworkMessage* msg);
- virtual vector<NG_NetworkMessage*> RetrieveNetworkMessages();
+ virtual std::vector<NG_NetworkMessage*> RetrieveNetworkMessages();
};
#endif //NG_LOOPBACKNETWORKDEVICEINTERFACE_H
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.h b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
index a18df8b4d64..4510747c0e5 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.h
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
@@ -44,7 +44,7 @@ class RAS_2DFilterManager
private:
unsigned int CreateShaderProgram(const char* shadersource);
unsigned int CreateShaderProgram(int filtermode);
- void AnalyseShader(int passindex, vector<STR_String>& propNames);
+ void AnalyseShader(int passindex, std::vector<STR_String>& propNames);
void StartShaderProgram(int passindex);
void EndShaderProgram();
void PrintShaderErrors(unsigned int shader, const char *task, const char *code);
@@ -77,7 +77,7 @@ private:
short m_enabled[MAX_RENDER_PASS];
// stores object properties to send to shaders in each pass
- vector<STR_String> m_properties[MAX_RENDER_PASS];
+ std::vector<STR_String> m_properties[MAX_RENDER_PASS];
void* m_gameObjects[MAX_RENDER_PASS];
public:
enum RAS_2DFILTER_MODE {
@@ -105,7 +105,7 @@ public:
void RenderFilters(RAS_ICanvas* canvas);
- void EnableFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text);
+ void EnableFilter(std::vector<STR_String>& propNames, void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text);
#ifdef WITH_CXX_GUARDEDALLOC
diff --git a/source/gameengine/Rasterizer/RAS_ICanvas.h b/source/gameengine/Rasterizer/RAS_ICanvas.h
index 3ca1c992162..2c2f62c946e 100644
--- a/source/gameengine/Rasterizer/RAS_ICanvas.h
+++ b/source/gameengine/Rasterizer/RAS_ICanvas.h
@@ -36,8 +36,6 @@
#include "MEM_guardedalloc.h"
#endif
-using namespace std;
-
class RAS_Rect;
/**