Removed shared_ptr usage for FunctionalTest

App/src/TestFunctionalTests.cpp

@@ -30,7 +30,7 @@ void TestFunctionalTests::execute()
     if(!readTestNames()) return;
 
     for(size_t i=0; i<m_testNames.size(); ++i) {
-        FunctionalTest_t test = m_testRegistry.getTest(m_testNames[i]);
+        boost::scoped_ptr<FunctionalTest> test(m_testRegistry.getTest(m_testNames[i]));
         test->getSimulation()->setProgramOptions(mp_options);
         test->runTest();
         test->analyseResults();

Core/StandardSamples/FunctionalTestRegistry.cpp

@@ -19,6 +19,8 @@
 #include <iostream>
 #include <iomanip>
 
+#include <boost/scoped_ptr.hpp>
+
 FunctionalTestRegistry::Catalogue FunctionalTestRegistry::m_catalogue = FunctionalTestRegistry::Catalogue();
 
 
@@ -176,9 +178,9 @@ bool FunctionalTestRegistry::isRegisteredName(const std::string &name)
 }
 
 
-FunctionalTest_t FunctionalTestRegistry::getTest(const std::string &name)
+FunctionalTest* FunctionalTestRegistry::getTest(const std::string &name)
 {
-    FunctionalTest_t test(new FunctionalTest(m_catalogue.getInfo(name)));
+    FunctionalTest* test = new FunctionalTest(m_catalogue.getInfo(name));
     return test;
 }
 
@@ -186,7 +188,7 @@ FunctionalTest_t FunctionalTestRegistry::getTest(const std::string &name)
 int FUNCTIONAL_TEST(const std::string &name)
 {
     FunctionalTestRegistry registry;
-    FunctionalTest_t test = registry.getTest(name);
+    boost::scoped_ptr<FunctionalTest> test(registry.getTest(name));
     test->runTest();
     return test->analyseResults();
 }

Core/StandardSamples/FunctionalTestRegistry.h

@@ -44,9 +44,7 @@ public:
 
     void printCatalogue() { m_catalogue.print(); }
 
-    FunctionalTest_t getTest(const std::string &name);
-
-    //FunctionalTest_t runTest(const std::string &name);
+    FunctionalTest* getTest(const std::string &name);
 
     bool isRegisteredName(const std::string &name);
 

Core/StandardSamples/IFunctionalTest.h

@@ -86,7 +86,4 @@ private:
     OutputData<double> *m_reference;
 };
 
-typedef boost::shared_ptr<FunctionalTest> FunctionalTest_t;
-
-
 #endif