Changeset a37c37

Timestamp:

May 8, 2010, 10:57:18 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

c93262

Parents:

788eeb

Message:

FIX: wrong use of Singleton pattern for CommandLineParser.

• we set _may_create to false, which is only needed for Factories.
• if we set to true, then we have to make constructor and destructor private and introduce the Singleton<> as friend.
• BUGFIX: setOptions() was called with internal argc,argv instead of given parameters in CommandLineParser::Run().

Location:

molecuilder/src

Files:

• CommandLineParser.cpp (modified) (1 diff)
• CommandLineParser.hpp (modified) (3 diffs)

molecuilder/src/CommandLineParser.cpp

@@ -73 +73 @@
 void CommandLineParser::Run(int _argc, char **_argv)
 {
-  setOptions(argc,argv);
+  setOptions(_argc,_argv);
   Parse();
 }

molecuilder/src/CommandLineParser.hpp

@@ -16 +16 @@
 
 
-class CommandLineParser : public Singleton<CommandLineParser, false> {
+class CommandLineParser : public Singleton<CommandLineParser> {
+  friend class Singleton<CommandLineParser>;
 public:
-  virtual ~CommandLineParser();
 
   // Parses the command line arguments in CommandLineParser::**argv with currently known options.
@@ -37 +37 @@
   po::options_description visible;
 
-protected:
-  CommandLineParser();
+  po::variables_map vm;
 
 private:
+  // private constructor and destructor
+  CommandLineParser();
+  virtual ~CommandLineParser();
+
   /* The following program_options options_decriptions are used to
    * generate the various cases and call differently in Parse().
@@ -46 +49 @@
   po::options_description cmdline_options;
   po::options_description config_file_options;
-
-  po::variables_map vm;
 
   // Sets the options from the three cases.