Changeset 10549 for code/branches/core7

Timestamp:

Aug 27, 2015, 10:40:50 PM (9 years ago)

Author:

landauf

Message:

renamed variable. it's the library's name (e.g. libpong) and not the modules name (e.g. 'pong')

Location:

code/branches/core7/src/libraries/core

Files:

• Core.cc (modified) (1 diff)
• module/ModuleInstance.cc (modified) (1 diff)
• module/ModuleInstance.h (modified) (3 diffs)

code/branches/core7/src/libraries/core/Core.cc

@@ -291 +291 @@
     void Core::loadModule(ModuleInstance* module)
     {
-        orxout(internal_info) << "Loading module " << module->getName() << "..." << endl;
+        orxout(internal_info) << "Loading module " << module->getLibraryName() << "..." << endl;
 
         ModuleInstance::setCurrentModuleInstance(module);
-        DynLib* dynLib = this->dynLibManager_->load(module->getName());
+        DynLib* dynLib = this->dynLibManager_->load(module->getLibraryName());
         module->setDynLib(dynLib);
 

code/branches/core7/src/libraries/core/module/ModuleInstance.cc

@@ -35 +35 @@
     ModuleInstance* ModuleInstance::currentModuleInstance_s = NULL;
 
-    ModuleInstance::ModuleInstance(const std::string& name)
-        : name_(name)
+    ModuleInstance::ModuleInstance(const std::string& libraryName)
+        : libraryName_(libraryName)
         , dynLib_(NULL)
     {

code/branches/core7/src/libraries/core/module/ModuleInstance.h

@@ -43 +43 @@
     {
         public:
-            ModuleInstance(const std::string& name);
+            ModuleInstance(const std::string& libraryName);
             ~ModuleInstance();
 
@@ -57 +57 @@
             void deleteAllStaticallyInitializedInstances();
 
-            inline const std::string& getName() const
-                { return this->name_; }
+            inline const std::string& getLibraryName() const
+                { return this->libraryName_; }
 
             inline void setDynLib(DynLib* dynLib)
@@ -70 +70 @@
         private:
             std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> > staticallyInitializedInstancesByType_;
-            std::string name_;
+            std::string libraryName_;
             DynLib* dynLib_;