Changeset 9406 in orxonox.OLD for trunk/src/lib/parser

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:

trunk/src/lib/parser

Files:

• cmdline_parser/cmdline_parser.cc (modified) (1 diff)
• ini_parser/ini_parser.cc (modified) (3 diffs)
• preferences/cmd_line_prefs_reader.cc (modified) (1 diff)
• preferences/ini_file_prefs_reader.cc (modified) (1 diff)

trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc

@@ -18 +18 @@
 #include "src/lib/util/substring.h"
 
-using namespace std;
+
 
 

trunk/src/lib/parser/ini_parser/ini_parser.cc

@@ -35 +35 @@
 #endif
 
-using namespace std;
+
 
 /**
@@ -142 +142 @@
       if ( (*lineBegin == '#' || *lineBegin == ';'))
       {
-        string newCommenLine = lineBegin;
+        std::string newCommenLine = lineBegin;
         this->commentList.push_back(newCommenLine);
         continue;
@@ -242 +242 @@
   }
   fclose(stream);
+  return true;
 }
 

trunk/src/lib/parser/preferences/cmd_line_prefs_reader.cc

@@ -20 +20 @@
 #include "preferences.h"
 
-using namespace std;
+
 
 RegistredArgs CmdLinePrefsReader::regArgs;

trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc

@@ -18 +18 @@
 #include "ini_file_prefs_reader.h"
 
-using namespace std;
+