Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10549


Ignore:
Timestamp:
Aug 27, 2015, 10:40:50 PM (6 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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core7/src/libraries/core/Core.cc

    r10547 r10549  
    291291    void Core::loadModule(ModuleInstance* module)
    292292    {
    293         orxout(internal_info) << "Loading module " << module->getName() << "..." << endl;
     293        orxout(internal_info) << "Loading module " << module->getLibraryName() << "..." << endl;
    294294
    295295        ModuleInstance::setCurrentModuleInstance(module);
    296         DynLib* dynLib = this->dynLibManager_->load(module->getName());
     296        DynLib* dynLib = this->dynLibManager_->load(module->getLibraryName());
    297297        module->setDynLib(dynLib);
    298298
  • code/branches/core7/src/libraries/core/module/ModuleInstance.cc

    r10536 r10549  
    3535    ModuleInstance* ModuleInstance::currentModuleInstance_s = NULL;
    3636
    37     ModuleInstance::ModuleInstance(const std::string& name)
    38         : name_(name)
     37    ModuleInstance::ModuleInstance(const std::string& libraryName)
     38        : libraryName_(libraryName)
    3939        , dynLib_(NULL)
    4040    {
  • code/branches/core7/src/libraries/core/module/ModuleInstance.h

    r10539 r10549  
    4343    {
    4444        public:
    45             ModuleInstance(const std::string& name);
     45            ModuleInstance(const std::string& libraryName);
    4646            ~ModuleInstance();
    4747
     
    5757            void deleteAllStaticallyInitializedInstances();
    5858
    59             inline const std::string& getName() const
    60                 { return this->name_; }
     59            inline const std::string& getLibraryName() const
     60                { return this->libraryName_; }
    6161
    6262            inline void setDynLib(DynLib* dynLib)
     
    7070        private:
    7171            std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> > staticallyInitializedInstancesByType_;
    72             std::string name_;
     72            std::string libraryName_;
    7373            DynLib* dynLib_;
    7474
Note: See TracChangeset for help on using the changeset viewer.