[Orxonox-commit 5870] r10530 - in code/branches/core7: src/libraries/core src/libraries/core/command src/libraries/core/commandline src/libraries/core/module src/libraries/core/singleton src/libraries/network test/core/class test/core/command test/core/object test/core/singleton
landauf at orxonox.net
landauf at orxonox.net
Sat Jun 6 14:45:20 CEST 2015
Author: landauf
Date: 2015-06-06 14:45:20 +0200 (Sat, 06 Jun 2015)
New Revision: 10530
Modified:
code/branches/core7/src/libraries/core/Core.cc
code/branches/core7/src/libraries/core/CoreIncludes.h
code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h
code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h
code/branches/core7/src/libraries/core/module/ModuleInstance.cc
code/branches/core7/src/libraries/core/module/ModuleInstance.h
code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc
code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h
code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h
code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h
code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc
code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc
code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc
code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc
code/branches/core7/test/core/class/SubclassIdentifierTest.cc
code/branches/core7/test/core/class/SuperTest.cc
code/branches/core7/test/core/command/CommandTest.cc
code/branches/core7/test/core/object/ClassFactoryTest.cc
code/branches/core7/test/core/object/ContextTest.cc
code/branches/core7/test/core/object/IteratorTest.cc
code/branches/core7/test/core/object/ListableTest.cc
code/branches/core7/test/core/object/ObjectListIteratorTest.cc
code/branches/core7/test/core/singleton/ScopeTest.cc
Log:
statically initialized instances may contain a type. currently not used.
Modified: code/branches/core7/src/libraries/core/Core.cc
===================================================================
--- code/branches/core7/src/libraries/core/Core.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/src/libraries/core/Core.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -129,7 +129,7 @@
// TODO: initialize ConsoleCommandManager here
// TODO: initialize NetworkFunctionManager here
this->rootModule_ = ModuleInstance::getCurrentModuleInstance();
- this->rootModule_->loadAllStaticallyInitializedInstances();
+ this->rootModule_->loadAllStaticallyInitializedInstances(0);
// Parse command line arguments AFTER the modules have been loaded (static code!)
CommandLineParser::parse(cmdLine);
@@ -245,7 +245,7 @@
Context::getRootContext()->unregisterObject(); // unregister context from object lists - otherwise the root context would be destroyed while unloading the root module
if (this->rootModule_)
{
- this->rootModule_->unloadAllStaticallyInitializedInstances();
+ this->rootModule_->unloadAllStaticallyInitializedInstances(0);
this->rootModule_->deleteAllStaticallyInitializedInstances();
}
Context::setRootContext(NULL);
@@ -286,7 +286,7 @@
ModuleInstance::setCurrentModuleInstance(module);
DynLib* dynLib = this->dynLibManager_->load(module->getName());
module->setDynLib(dynLib);
- module->loadAllStaticallyInitializedInstances();
+ module->loadAllStaticallyInitializedInstances(0);
IdentifierManager::getInstance().createClassHierarchy();
ScopeManager::getInstance().updateListeners();
}
@@ -306,7 +306,7 @@
{
orxout(internal_info) << "Unloading module " << module->getName() << "..." << endl;
- module->unloadAllStaticallyInitializedInstances();
+ module->unloadAllStaticallyInitializedInstances(0);
module->deleteAllStaticallyInitializedInstances();
this->dynLibManager_->unload(module->getDynLib());
module->setDynLib(NULL);
Modified: code/branches/core7/src/libraries/core/CoreIncludes.h
===================================================================
--- code/branches/core7/src/libraries/core/CoreIncludes.h 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/src/libraries/core/CoreIncludes.h 2015-06-06 12:45:20 UTC (rev 10530)
@@ -224,7 +224,10 @@
};
public:
- StaticallyInitializedIdentifier(Identifier* identifier) : identifier_(identifier) {}
+ StaticallyInitializedIdentifier(Identifier* identifier)
+ : StaticallyInitializedInstance(0)
+ , identifier_(identifier)
+ {}
~StaticallyInitializedIdentifier() { delete identifier_; }
virtual void load()
Modified: code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h
===================================================================
--- code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h 2015-06-06 12:45:20 UTC (rev 10530)
@@ -309,7 +309,10 @@
class _CoreExport StaticallyInitializedConsoleCommand : public StaticallyInitializedInstance
{
public:
- StaticallyInitializedConsoleCommand(ConsoleCommand* command) : command_(command) {}
+ StaticallyInitializedConsoleCommand(ConsoleCommand* command)
+ : StaticallyInitializedInstance(0)
+ , command_(command)
+ {}
~StaticallyInitializedConsoleCommand() { delete command_; }
virtual void load();
Modified: code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h
===================================================================
--- code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h 2015-06-06 12:45:20 UTC (rev 10530)
@@ -57,7 +57,10 @@
class _CoreExport StaticallyInitializedCommandLineArgument : public StaticallyInitializedInstance
{
public:
- StaticallyInitializedCommandLineArgument(CommandLineArgument* argument) : argument_(argument) {}
+ StaticallyInitializedCommandLineArgument(CommandLineArgument* argument)
+ : StaticallyInitializedInstance(0)
+ , argument_(argument)
+ {}
~StaticallyInitializedCommandLineArgument() { delete argument_; }
virtual void load()
Modified: code/branches/core7/src/libraries/core/module/ModuleInstance.cc
===================================================================
--- code/branches/core7/src/libraries/core/module/ModuleInstance.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/src/libraries/core/module/ModuleInstance.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -47,32 +47,35 @@
void ModuleInstance::addStaticallyInitializedInstance(StaticallyInitializedInstance* instance)
{
- this->staticallyInitializedInstances_.insert(instance);
+ this->staticallyInitializedInstancesByType_[instance->getType()].insert(instance);
}
- void ModuleInstance::loadAllStaticallyInitializedInstances()
+ void ModuleInstance::removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance)
{
- for (std::set<StaticallyInitializedInstance*>::iterator it = this->staticallyInitializedInstances_.begin(); it != this->staticallyInitializedInstances_.end(); ++it)
- (*it)->load();
+ this->staticallyInitializedInstancesByType_[instance->getType()].erase(instance);
}
- void ModuleInstance::unloadAllStaticallyInitializedInstances()
+ void ModuleInstance::loadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type)
{
- for (std::set<StaticallyInitializedInstance*>::iterator it = this->staticallyInitializedInstances_.begin(); it != this->staticallyInitializedInstances_.end(); ++it)
- (*it)->unload();
+ const std::set<StaticallyInitializedInstance*>& instances = this->staticallyInitializedInstancesByType_[type];
+ for (std::set<StaticallyInitializedInstance*>::iterator it = instances.begin(); it != instances.end(); ++it)
+ (*it)->load();
}
- void ModuleInstance::removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance)
+ void ModuleInstance::unloadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type)
{
- this->staticallyInitializedInstances_.erase(instance);
+ const std::set<StaticallyInitializedInstance*>& instances = this->staticallyInitializedInstancesByType_[type];
+ for (std::set<StaticallyInitializedInstance*>::iterator it = instances.begin(); it != instances.end(); ++it)
+ (*it)->unload();
}
void ModuleInstance::deleteAllStaticallyInitializedInstances()
{
- std::set<StaticallyInitializedInstance*> copy(this->staticallyInitializedInstances_);
- this->staticallyInitializedInstances_.clear();
- for (std::set<StaticallyInitializedInstance*>::iterator it = copy.begin(); it != copy.end(); ++it)
- delete (*it);
+ std::map<StaticallyInitializedInstance::Type, std::set<StaticallyInitializedInstance*> > copy(this->staticallyInitializedInstancesByType_);
+ this->staticallyInitializedInstancesByType_.clear();
+ for (std::map<StaticallyInitializedInstance::Type, std::set<StaticallyInitializedInstance*> >::iterator it1 = copy.begin(); it1 != copy.end(); ++it1)
+ for (std::set<StaticallyInitializedInstance*>::iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2)
+ delete (*it2);
}
Modified: code/branches/core7/src/libraries/core/module/ModuleInstance.h
===================================================================
--- code/branches/core7/src/libraries/core/module/ModuleInstance.h 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/src/libraries/core/module/ModuleInstance.h 2015-06-06 12:45:20 UTC (rev 10530)
@@ -32,8 +32,11 @@
#include "core/CorePrereqs.h"
#include <set>
+#include <map>
#include <string>
+#include "StaticallyInitializedInstance.h"
+
namespace orxonox
{
class _CoreExport ModuleInstance
@@ -43,9 +46,11 @@
~ModuleInstance();
void addStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
- void loadAllStaticallyInitializedInstances();
- void unloadAllStaticallyInitializedInstances();
void removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
+
+ void loadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type);
+ void unloadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type);
+
void deleteAllStaticallyInitializedInstances();
inline const std::string& getName() const
@@ -60,7 +65,7 @@
static ModuleInstance* getCurrentModuleInstance();
private:
- std::set<StaticallyInitializedInstance*> staticallyInitializedInstances_;
+ std::map<StaticallyInitializedInstance::Type, std::set<StaticallyInitializedInstance*> > staticallyInitializedInstancesByType_;
std::string name_;
DynLib* dynLib_;
Modified: code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc
===================================================================
--- code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -32,8 +32,9 @@
namespace orxonox
{
- StaticallyInitializedInstance::StaticallyInitializedInstance()
+ StaticallyInitializedInstance::StaticallyInitializedInstance(Type type)
{
+ this->type_ = type;
this->module_ = ModuleInstance::getCurrentModuleInstance();
this->module_->addStaticallyInitializedInstance(this);
}
Modified: code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h
===================================================================
--- code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h 2015-06-06 12:45:20 UTC (rev 10530)
@@ -36,14 +36,20 @@
class _CoreExport StaticallyInitializedInstance
{
public:
- StaticallyInitializedInstance();
+ typedef int Type;
+
+ StaticallyInitializedInstance(Type type);
virtual ~StaticallyInitializedInstance();
virtual void load() = 0;
virtual void unload() = 0;
+ inline Type getType() const
+ { return this->type_; }
+
private:
ModuleInstance* module_;
+ Type type_;
};
}
Modified: code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h
===================================================================
--- code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h 2015-06-06 12:45:20 UTC (rev 10530)
@@ -80,7 +80,8 @@
{
public:
StaticallyInitializedScopedSingletonWrapper(ScopedSingletonWrapper* wrapper, ScopeID::Value scope)
- : wrapper_(wrapper)
+ : StaticallyInitializedInstance(0)
+ , wrapper_(wrapper)
, scope_(scope)
{}
~StaticallyInitializedScopedSingletonWrapper() { delete wrapper_; }
Modified: code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h
===================================================================
--- code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h 2015-06-06 12:45:20 UTC (rev 10530)
@@ -50,7 +50,10 @@
class _NetworkExport StaticallyInitializedNetworkFunction : public StaticallyInitializedInstance
{
public:
- StaticallyInitializedNetworkFunction(NetworkFunctionBase* function) : function_(function) {}
+ StaticallyInitializedNetworkFunction(NetworkFunctionBase* function)
+ : StaticallyInitializedInstance(0)
+ , function_(function)
+ {}
~StaticallyInitializedNetworkFunction() { delete function_; }
virtual void load();
Modified: code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc
===================================================================
--- code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -141,7 +141,7 @@
public:
virtual void SetUp()
{
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
}
@@ -149,7 +149,7 @@
virtual void TearDown()
{
IdentifierManager::getInstance().destroyClassHierarchy();
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
}
};
Modified: code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc
===================================================================
--- code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -48,7 +48,7 @@
public:
virtual void SetUp()
{
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
}
@@ -56,7 +56,7 @@
virtual void TearDown()
{
IdentifierManager::getInstance().destroyClassHierarchy();
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
}
};
Modified: code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc
===================================================================
--- code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -108,7 +108,7 @@
public:
virtual void SetUp()
{
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
}
@@ -116,7 +116,7 @@
virtual void TearDown()
{
IdentifierManager::getInstance().destroyClassHierarchy();
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
}
};
Modified: code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc
===================================================================
--- code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -50,7 +50,7 @@
public:
virtual void SetUp()
{
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
}
@@ -58,7 +58,7 @@
virtual void TearDown()
{
IdentifierManager::getInstance().destroyClassHierarchy();
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
}
};
Modified: code/branches/core7/test/core/class/SubclassIdentifierTest.cc
===================================================================
--- code/branches/core7/test/core/class/SubclassIdentifierTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/class/SubclassIdentifierTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -30,7 +30,7 @@
public:
virtual void SetUp()
{
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
@@ -42,7 +42,7 @@
Context::setRootContext(NULL);
IdentifierManager::getInstance().destroyClassHierarchy();
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
}
};
}
Modified: code/branches/core7/test/core/class/SuperTest.cc
===================================================================
--- code/branches/core7/test/core/class/SuperTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/class/SuperTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -71,7 +71,7 @@
public:
virtual void SetUp()
{
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
@@ -83,7 +83,7 @@
Context::setRootContext(NULL);
IdentifierManager::getInstance().destroyClassHierarchy();
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
}
};
}
Modified: code/branches/core7/test/core/command/CommandTest.cc
===================================================================
--- code/branches/core7/test/core/command/CommandTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/command/CommandTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -139,7 +139,7 @@
public:
virtual void SetUp()
{
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
}
@@ -147,7 +147,7 @@
virtual void TearDown()
{
IdentifierManager::getInstance().destroyClassHierarchy();
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
}
};
}
Modified: code/branches/core7/test/core/object/ClassFactoryTest.cc
===================================================================
--- code/branches/core7/test/core/object/ClassFactoryTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/object/ClassFactoryTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -15,12 +15,12 @@
virtual void SetUp()
{
Context::setRootContext(new Context(NULL));
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
}
virtual void TearDown()
{
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
Context::setRootContext(NULL);
}
};
Modified: code/branches/core7/test/core/object/ContextTest.cc
===================================================================
--- code/branches/core7/test/core/object/ContextTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/object/ContextTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -23,12 +23,12 @@
virtual void SetUp()
{
Context::setRootContext(new Context(NULL));
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
}
virtual void TearDown()
{
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
Context::setRootContext(NULL);
}
};
Modified: code/branches/core7/test/core/object/IteratorTest.cc
===================================================================
--- code/branches/core7/test/core/object/IteratorTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/object/IteratorTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -34,12 +34,12 @@
virtual void SetUp()
{
Context::setRootContext(new Context(NULL));
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
}
virtual void TearDown()
{
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
Context::setRootContext(NULL);
}
};
Modified: code/branches/core7/test/core/object/ListableTest.cc
===================================================================
--- code/branches/core7/test/core/object/ListableTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/object/ListableTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -39,12 +39,12 @@
virtual void SetUp()
{
Context::setRootContext(new Context(NULL));
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
}
virtual void TearDown()
{
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
Context::setRootContext(NULL);
}
};
Modified: code/branches/core7/test/core/object/ObjectListIteratorTest.cc
===================================================================
--- code/branches/core7/test/core/object/ObjectListIteratorTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/object/ObjectListIteratorTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -26,12 +26,12 @@
virtual void SetUp()
{
Context::setRootContext(new Context(NULL));
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
}
virtual void TearDown()
{
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
Context::setRootContext(NULL);
}
};
Modified: code/branches/core7/test/core/singleton/ScopeTest.cc
===================================================================
--- code/branches/core7/test/core/singleton/ScopeTest.cc 2015-06-06 10:38:40 UTC (rev 10529)
+++ code/branches/core7/test/core/singleton/ScopeTest.cc 2015-06-06 12:45:20 UTC (rev 10530)
@@ -26,12 +26,12 @@
public:
virtual void SetUp()
{
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
}
virtual void TearDown()
{
- ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+ ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
}
};
}
More information about the Orxonox-commit
mailing list