[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44362] trunk/blender/source/gameengine: BGE is compilable by MSVC again
Sergey Sharybin
sergey.vfx at gmail.com
Thu Feb 23 10:40:16 CET 2012
Revision: 44362
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44362
Author: nazgul
Date: 2012-02-23 09:40:10 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
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).
Modified Paths:
--------------
trunk/blender/source/gameengine/GameLogic/SCA_IScene.h
trunk/blender/source/gameengine/Ketsji/KX_Scene.h
trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
Modified: trunk/blender/source/gameengine/GameLogic/SCA_IScene.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IScene.h 2012-02-23 09:26:53 UTC (rev 44361)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IScene.h 2012-02-23 09:40:10 UTC (rev 44362)
@@ -68,7 +68,7 @@
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) {}
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.h 2012-02-23 09:26:53 UTC (rev 44361)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.h 2012-02-23 09:40:10 UTC (rev 44362)
@@ -140,12 +140,12 @@
/**
* 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 @@
/** Font Routines */
- list<class KX_FontObject*>*
+ std::list<class KX_FontObject*>*
GetFonts(
);
@@ -402,7 +402,7 @@
/** Camera Routines */
- list<class KX_Camera*>*
+ std::list<class KX_Camera*>*
GetCameras(
);
@@ -584,7 +584,7 @@
/**
* 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;};
Modified: trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
===================================================================
--- trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp 2012-02-23 09:26:53 UTC (rev 44361)
+++ trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp 2012-02-23 09:40:10 UTC (rev 44362)
@@ -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>
Modified: trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
===================================================================
--- trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h 2012-02-23 09:26:53 UTC (rev 44361)
+++ trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h 2012-02-23 09:40:10 UTC (rev 44362)
@@ -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 @@
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
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h 2012-02-23 09:26:53 UTC (rev 44361)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h 2012-02-23 09:40:10 UTC (rev 44362)
@@ -44,7 +44,7 @@
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 @@
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 @@
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
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h 2012-02-23 09:26:53 UTC (rev 44361)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h 2012-02-23 09:40:10 UTC (rev 44362)
@@ -36,8 +36,6 @@
#include "MEM_guardedalloc.h"
#endif
-using namespace std;
-
class RAS_Rect;
/**
More information about the Bf-blender-cvs
mailing list