Changeset 10520 for code/branches/core7/src/libraries/core/commandline

Timestamp:

May 31, 2015, 11:54:06 AM (10 years ago)

Author:

landauf

Message:

StaticallyInitializedInstances are now responsible to delete the wrapped object.

Location:

code/branches/core7/src/libraries/core/commandline

Files:

• CommandLineIncludes.h (modified) (1 diff)
• CommandLineParser.cc (modified) (2 diffs)
• CommandLineParser.h (modified) (1 diff)

code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h

@@ -59 +59 @@
         public:
             StaticallyInitializedCommandLineArgument(CommandLineArgument* argument) : argument_(argument) {}
+            ~StaticallyInitializedCommandLineArgument() { delete argument_; }
 
             virtual void load()

code/branches/core7/src/libraries/core/commandline/CommandLineParser.cc

@@ -85 +85 @@
     CommandLineParser::~CommandLineParser()
     {
-        CommandLineParser::destroyAllArguments();
     }
 
@@ -96 +95 @@
         static CommandLineParser instance;
         return instance;
-    }
-
-    /**
-    @brief
-        Destroys all command line arguments. This should be called at the end
-        of main. Do not use before that.
-    */
-    void CommandLineParser::destroyAllArguments()
-    {
-        for (std::map<std::string, CommandLineArgument*>::const_iterator it = _getInstance().cmdLineArgs_.begin();
-            it != _getInstance().cmdLineArgs_.end(); ++it)
-            delete it->second;
-        _getInstance().cmdLineArgs_.clear();
     }
 

code/branches/core7/src/libraries/core/commandline/CommandLineParser.h

@@ -161 +161 @@
         }
 
-        static void destroyAllArguments();
-
         static void generateDoc(std::ofstream& file);