Changeset 10470 for code/branches/core7/src/libraries/network/NetworkFunction.cc

Timestamp:

May 25, 2015, 12:25:29 PM (9 years ago)

Author:

landauf

Message:

NetworkFunctionBase doesn't have to inherit from Listable: there's a list of all instances stored in NetworkFunctionManager stored anyway

File:

• code/branches/core7/src/libraries/network/NetworkFunction.cc (modified) (4 diffs)

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

@@ -29 +29 @@
 #include "NetworkFunction.h"
 #include "NetworkFunctionManager.h"
-#include "core/CoreIncludes.h"
 
 namespace orxonox
@@ -36 +35 @@
   std::map<uint32_t, NetworkMemberFunctionBase*> NetworkMemberFunctionBase::idMap_;
 
-  // no suitable factory for NetworkFunctionBase (and children), so we declare it abstract
-  RegisterAbstractClass(NetworkFunctionBase).inheritsFrom<Listable>();
-  RegisterAbstractClass(NetworkFunctionStatic).inheritsFrom<NetworkFunctionBase>();
-  RegisterAbstractClass(NetworkMemberFunctionBase).inheritsFrom<NetworkFunctionBase>();
-
   NetworkFunctionBase::NetworkFunctionBase(const std::string& name)
   {
-      RegisterObject(NetworkFunctionBase);
-
     static uint32_t networkID = 0;
     this->networkID_ = networkID++;
@@ -59 +51 @@
     NetworkFunctionBase(name)
   {
-    RegisterObject(NetworkFunctionStatic);
-
     this->functor_ = functor;
     NetworkFunctionStatic::getFunctorMap()[p] = this;
@@ -82 +72 @@
     NetworkFunctionBase(name)
   {
-    RegisterObject(NetworkMemberFunctionBase);
-
     this->functorMap_[p] = this;
     this->idMap_[ this->getNetworkID() ] = this;