Changeset 9667 for code/trunk/src/libraries/network/NetworkFunction.h

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/network/NetworkFunction.h (modified) (2 diffs)

code/trunk/src/libraries/network/NetworkFunction.h

@@ -39 +39 @@
 #include <boost/static_assert.hpp>
 
-#include "core/Identifier.h"
+#include "core/object/Listable.h"
+#include "core/class/Identifier.h"
 #include "core/command/Functor.h"
 #include "FunctionCallManager.h"
@@ -70 +71 @@
 
 
-class _NetworkExport NetworkFunctionBase: virtual public OrxonoxClass {
+class _NetworkExport NetworkFunctionBase: virtual public Listable {
   public:
     NetworkFunctionBase(const std::string& name);