Changeset 294 in pacpusframework

Timestamp:

Mar 28, 2014, 11:20:17 AM (11 years ago)

Author:

Marek Kurdej

Message:

Fixed: GCC compilation problems with shared_ptr.

Location:

trunk/src

Files:

• DBITEPlayerLib/DbtPlyTrigger.cpp (modified) (1 diff)
• DBITEPlayerLib/DbtPlyUserInterface.cpp (modified) (1 diff)
• PacpusLib/ComponentManager.cpp (modified) (2 diffs)

trunk/src/DBITEPlayerLib/DbtPlyTrigger.cpp

@@ -19 +19 @@
 DbtPlyTrigger::DbtPlyTrigger(QString name)
     : ComponentBase(name)
-    , mEngine(NULL)
 {
 }

trunk/src/DBITEPlayerLib/DbtPlyUserInterface.cpp

@@ -34 +34 @@
     : ComponentBase(name)
     , componentTableWidget(NULL)
-    , mEngine(NULL)
 {
     relTime_ = absTime_ = tMin_ = tMax_ = 0;

trunk/src/PacpusLib/ComponentManager.cpp

@@ -180 +180 @@
     }
 
-    boost::shared_ptr<ComponentBase> component = componentMap_.value(name, NULL);
+    ComponentSharedPointer component = componentMap_.value(name, ComponentSharedPointer());
     
     // FIXME: remove from map (causes segfault in QMap::qMapLessThanKey on Windows)
@@ -501 +501 @@
     }
 
+    // FIXME: throw
     LOG_WARN("cannot retrieve component '" << name << "'" << ". It does not exist");
-    return NULL;
+    return ComponentSharedPointer();
 }