[Orxonox-commit 5809] r10469 - code/branches/core7/src/libraries/network

[landauf at orxonox.net]

Author: landauf
Date: 2015-05-25 12:16:43 +0200 (Mon, 25 May 2015)
New Revision: 10469

Modified:
   code/branches/core7/src/libraries/network/NetworkFunction.h
   code/branches/core7/src/libraries/network/NetworkFunctionManager.cc
   code/branches/core7/src/libraries/network/NetworkFunctionManager.h
Log:
removed unused code

Modified: code/branches/core7/src/libraries/network/NetworkFunction.h
===================================================================
--- code/branches/core7/src/libraries/network/NetworkFunction.h	2015-05-25 10:13:27 UTC (rev 10468)
+++ code/branches/core7/src/libraries/network/NetworkFunction.h	2015-05-25 10:16:43 UTC (rev 10469)
@@ -97,8 +97,6 @@
 
     virtual void setNetworkID( uint32_t id )
         { NetworkFunctionBase::setNetworkID( id ); NetworkFunctionStatic::getIdMap()[id] = this; }
-    static inline NetworkFunctionStatic* getNetworkFunction( uint32_t id)
-        { assert( NetworkFunctionStatic::getIdMap().find(id)!=NetworkFunctionStatic::getIdMap().end() ); return NetworkFunctionStatic::getIdMap()[id]; }
     static NetworkFunctionStatic* getFunction( uint32_t id )
         { assert( NetworkFunctionStatic::getIdMap().find(id) != NetworkFunctionStatic::getIdMap().end() ); return NetworkFunctionStatic::getIdMap()[id]; }
     static NetworkFunctionStatic* getFunction( const NetworkFunctionPointer& p )
@@ -118,7 +116,6 @@
     ~NetworkMemberFunctionBase();
 
     virtual void setNetworkID( uint32_t id ){ NetworkFunctionBase::setNetworkID( id ); idMap_[id] = this; }
-    static inline NetworkMemberFunctionBase* getNetworkFunction( uint32_t id){ assert( idMap_.find(id)!=idMap_.end() ); return idMap_[id]; }
     static NetworkMemberFunctionBase* getFunction( uint32_t id ){ assert( idMap_.find(id) != idMap_.end() ); return idMap_[id]; }
     static NetworkMemberFunctionBase* getFunction( const NetworkFunctionPointer& p ){ assert( functorMap_.find(p) != functorMap_.end() ); return functorMap_[p]; }
 

Modified: code/branches/core7/src/libraries/network/NetworkFunctionManager.cc
===================================================================
--- code/branches/core7/src/libraries/network/NetworkFunctionManager.cc	2015-05-25 10:13:27 UTC (rev 10468)
+++ code/branches/core7/src/libraries/network/NetworkFunctionManager.cc	2015-05-25 10:16:43 UTC (rev 10469)
@@ -31,8 +31,6 @@
 
 namespace orxonox
 {
-    std::map<uint32_t, bool> NetworkFunctionManager::isStaticMap_;
-
     /* static */NetworkFunctionManager& NetworkFunctionManager::getInstance()
     {
         static NetworkFunctionManager instance;

Modified: code/branches/core7/src/libraries/network/NetworkFunctionManager.h
===================================================================
--- code/branches/core7/src/libraries/network/NetworkFunctionManager.h	2015-05-25 10:13:27 UTC (rev 10468)
+++ code/branches/core7/src/libraries/network/NetworkFunctionManager.h	2015-05-25 10:16:43 UTC (rev 10469)
@@ -41,13 +41,9 @@
         public:
             static NetworkFunctionManager& getInstance();
 
-            static inline bool  isStatic( uint32_t networkID )  { return isStaticMap_[networkID]; }
             static void setNetworkID(const std::string& name, uint32_t id);
             static void destroyAllNetworkFunctions();
             static std::map<std::string, NetworkFunctionBase*>& getNameMap();
-
-          private:
-            static std::map<uint32_t, bool> isStaticMap_;
     };
 }