[oprof-cvs] CVS: oprofile/libopt++ popt_options.cpp,1.10,1.11 popt_options.h,1.9,1.10

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/libopt++
In directory usw-pr-cvs1:/tmp/cvs-serv10838/libopt++

Modified Files:
	popt_options.cpp popt_options.h 
Log Message:
ABI fixes (de inline, gcc 3.2). Fix daemon Makefiles. Use popt::
namespace to avoid clash with getopt.h on 3.2



Index: popt_options.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libopt++/popt_options.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- popt_options.cpp	1 Oct 2002 22:32:31 -0000	1.10
+++ popt_options.cpp	14 Nov 2002 04:29:12 -0000	1.11
@@ -19,6 +19,8 @@
 
 using namespace std;
 
+namespace popt {
+ 
 /**
  * option_base - base class for implementation of a command line option
  *
@@ -315,3 +317,5 @@
 		popt_value = 0;
 	}
 }
+
+} // namespace popt

Index: popt_options.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libopt++/popt_options.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- popt_options.h	27 Sep 2002 23:12:39 -0000	1.9
+++ popt_options.h	14 Nov 2002 04:29:12 -0000	1.10
@@ -43,6 +43,8 @@
 #include <string>
 #include <vector>
 
+namespace popt {
+ 
 /**
  * parse_options - parse command line options
  * @param argc like the parameter of main()
@@ -103,4 +105,6 @@
 			   char const * option_name, char short_name,
 			   char const * help_str, char const * arg_help_str);
 
-#endif /* ! POPT_OPTIONS_H */
+}; // namespace popt
+
+#endif // POPT_OPTIONS_H