Changeset 2103 for code/trunk/src/core/CommandLine.h

Timestamp:

Nov 2, 2008, 12:22:42 AM (16 years ago)

Author:

rgrieder

Message:

Merged r2101 (objecthierarchy) to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/CommandLine.h (modified) (3 diffs)

code/trunk/src/core/CommandLine.h

@@ -38 +38 @@
 
 #define SetCommandLineArgument(name, defaultValue) \
-    CommandLineArgument& CmdArgumentDummyBoolVar##name \
+    orxonox::CommandLineArgument& CmdArgumentDummyBoolVar##name \
     = orxonox::CommandLine::addArgument(#name, defaultValue)
 #define SetCommandLineSwitch(name) \
-    CommandLineArgument& CmdArgumentDummyBoolVar##name \
+    orxonox::CommandLineArgument& CmdArgumentDummyBoolVar##name \
     = orxonox::CommandLine::addArgument(#name, false)
 
@@ -135 +135 @@
 
         //! Parse redirection to internal member method.
-        static void parse(const std::vector<std::string>& arguments) { _getInstance()._parse(arguments); }
+        static void parseAll(int argc, char** argv) { _getInstance()._parseAll(argc, argv); }
 
         static std::string getUsageInformation();
@@ -165 +165 @@
         static CommandLine& _getInstance();
 
+        void _parseAll(int argc, char** argv);
         void _parse(const std::vector<std::string>& arguments);
         void checkFullArgument(const std::string& name, const std::string& value);