Changeset 10469 for code/branches/core7

Timestamp:

May 25, 2015, 12:16:43 PM (10 years ago)

Author:

landauf

Message:

removed unused code

Location:

code/branches/core7/src/libraries/network

Files:

• NetworkFunction.h (modified) (2 diffs)
• NetworkFunctionManager.cc (modified) (1 diff)
• NetworkFunctionManager.h (modified) (1 diff)

code/branches/core7/src/libraries/network/NetworkFunction.h

@@ -98 +98 @@
     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]; }
@@ -119 +117 @@
 
     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]; }

code/branches/core7/src/libraries/network/NetworkFunctionManager.cc

@@ -32 +32 @@
 namespace orxonox
 {
-    std::map<uint32_t, bool> NetworkFunctionManager::isStaticMap_;
-
     /* static */NetworkFunctionManager& NetworkFunctionManager::getInstance()
     {

code/branches/core7/src/libraries/network/NetworkFunctionManager.h

@@ -42 +42 @@
             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_;
     };
 }