Changeset 11071 for code/trunk/src/libraries/core/module/Plugin.cc

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/module/Plugin.cc (modified) (4 diffs)

code/trunk/src/libraries/core/module/Plugin.cc

@@ -39 +39 @@
     {
         this->referenceCounter_ = 0;
-        this->moduleInstance_ = NULL;
+        this->moduleInstance_ = nullptr;
     }
 
@@ -45 +45 @@
     {
         // force unloading of the module when the plugin is destroyed
-        if (this->moduleInstance_ != NULL)
+        if (this->moduleInstance_ != nullptr)
             this->unloadModule();
     }
@@ -79 +79 @@
     {
         // only load module if it isn't already loaded. otherwise merely activate it.
-        if (this->moduleInstance_ == NULL)
+        if (this->moduleInstance_ == nullptr)
             this->loadModule();
         else
@@ -112 +112 @@
         Core::getInstance().unloadModule(this->moduleInstance_);
         delete this->moduleInstance_;
-        this->moduleInstance_ = NULL;
+        this->moduleInstance_ = nullptr;
     }
     void Plugin::deactivateModule()