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/Network
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/Network')
-rw-r--r--source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp2
-rw-r--r--source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h4
2 files changed, 3 insertions, 3 deletions
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