Changeset 9869 in orxonox.OLD for trunk/src/lib/parser/cmdline_parser

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/lib/parser/cmdline_parser

Files:

• Makefile.am (modified) (1 diff)
• cmdline_parser.cc (modified) (1 diff)
• cmdline_parser.h (modified) (1 diff)

trunk/src/lib/parser/cmdline_parser/Makefile.am

@@ +1 @@
+
+INCLUDES = -I../../..
 
 noinst_LIBRARIES = libCmdLineParser.a

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

@@ -16 +16 @@
 #include "cmdline_parser.h"
 
+#include <cassert>
 #include "src/lib/util/substring.h"
 

trunk/src/lib/parser/cmdline_parser/cmdline_parser.h

@@ -11 +11 @@
 #include <vector>
 
-#include "src/defs/debug.h"
-#include "src/lib/util/multi_type.h"
+#include "lib/util/debug.h"
+#include "lib/util/multi_type.h"