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:
Diffstat (limited to 'source/gameengine/Network')
-rw-r--r--source/gameengine/Network/CMakeLists.txt2
-rw-r--r--source/gameengine/Network/LoopBackNetwork/CMakeLists.txt2
-rw-r--r--source/gameengine/Network/LoopBackNetwork/SConscript2
-rw-r--r--source/gameengine/Network/NG_NetworkScene.h8
-rw-r--r--source/gameengine/Network/SConscript2
5 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Network/CMakeLists.txt b/source/gameengine/Network/CMakeLists.txt
index 6a2b5fe841e..7f4c7c357da 100644
--- a/source/gameengine/Network/CMakeLists.txt
+++ b/source/gameengine/Network/CMakeLists.txt
@@ -26,8 +26,8 @@
set(INC
.
- ../../../source/kernel/gen_system
../../../intern/string
+ ../../../intern/container
../../../intern/moto/include
)
diff --git a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
index 4cf43a1fc93..d7b88304474 100644
--- a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
+++ b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
@@ -26,8 +26,8 @@
set(INC
.
- ../../../../source/kernel/gen_system
../../../../intern/string
+ ../../../../intern/container
../../../../source/gameengine/Network
)
diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript
index af76065cc94..7ca0a64f774 100644
--- a/source/gameengine/Network/LoopBackNetwork/SConscript
+++ b/source/gameengine/Network/LoopBackNetwork/SConscript
@@ -3,6 +3,6 @@ Import ('env')
sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
-incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
+incs = '. #intern/string #intern/container #source/gameengine/Network'
env.BlenderLib ( 'ge_logic_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,135] )
diff --git a/source/gameengine/Network/NG_NetworkScene.h b/source/gameengine/Network/NG_NetworkScene.h
index d390eabc465..ebe50d36b46 100644
--- a/source/gameengine/Network/NG_NetworkScene.h
+++ b/source/gameengine/Network/NG_NetworkScene.h
@@ -34,7 +34,7 @@
#ifndef __NG_NETWORKSCENE_H
#define __NG_NETWORKSCENE_H
-#include "GEN_Map.h"
+#include "CTR_Map.h"
#include "STR_HashedString.h"
#include <vector>
@@ -52,10 +52,10 @@ class NG_NetworkDeviceInterface;
class NG_NetworkScene
{
class NG_NetworkDeviceInterface *m_networkdevice;
- GEN_Map<STR_HashedString, class NG_NetworkObject *> m_networkObjects;
+ CTR_Map<STR_HashedString, class NG_NetworkObject *> m_networkObjects;
- // GEN_Maps used as a 'Bloom' filter
- typedef GEN_Map<STR_HashedString, std::vector<class NG_NetworkMessage*>* > TMessageMap;
+ // CTR_Maps used as a 'Bloom' filter
+ typedef CTR_Map<STR_HashedString, std::vector<class NG_NetworkMessage*>* > TMessageMap;
TMessageMap m_messagesByDestinationName;
TMessageMap m_messagesBySenderName;
TMessageMap m_messagesBySubject;
diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript
index 1b63592d0a4..bbf714383b7 100644
--- a/source/gameengine/Network/SConscript
+++ b/source/gameengine/Network/SConscript
@@ -3,7 +3,7 @@ Import ('env')
sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_NetworkScene.cpp'
-incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
+incs = '. #intern/string #intern/moto/include #intern/container'
defs = []