[boost] [PATCH] Fix tools/wave compilation

From: Richard Guenther (rguenther_at_[hidden])
Date: 2006-05-11 10:32:00

I have problems building the wave preprocessor for the 1.33.1 release due
to some typos in cpp.cpp (which are corrected by the patch below, CVS 
needs the same patch but that doesn't suffice and it fails in more 
interesting ways).  This leads me to the question on the state of
tools/wave - is it considered dead or obsolete?  Preprocessing sources
with the 1.33.1 release of wave causes spurious errors like

/abuild/rguenther/boost/tramp3d-v4.cpp(4611): error: generic lexing error: 
'\000' in input stream

if built with gcc 4.1.0 or the gcc trunk.

Any ideas?

Thanks,
Richard.

--
Richard Guenther <rguenther_at_[hidden]>
Novell / SUSE Labs
--- tools/wave/cpp.cpp.orig	2005-05-16 11:36:01.000000000 +0200
+++ tools/wave/cpp.cpp	2006-05-11 16:14:31.000000000 +0200
@@ -108,7 +108,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // forward declarations only
-namespace cmd_line_utils 
+namespace cmd_line_util
 {
     class include_paths;
 }
@@ -116,7 +116,7 @@
 namespace boost { namespace program_options 
 {
     void validate(boost::any &v, std::vector<std::string> const &s,
-        cmd_line_utils::include_paths *, int);
+        cmd_line_util::include_paths *, long);
 }} // boost::program_options
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -234,7 +234,7 @@
 namespace boost { namespace program_options {
 
     void validate(boost::any &v, std::vector<std::string> const &s,
-        cmd_line_util::include_paths *, int) 
+        cmd_line_util::include_paths *, long) 
     {
         cmd_line_util::include_paths::validate(v, s);
     }