[Boost-commit] svn:boost r45062 - in trunk/libs/wave: . test/testwave

From: hartmut.kaiser_at_[hidden]
Date: 2008-05-03 08:55:46

Author: hkaiser
Date: 2008-05-03 08:55:45 EDT (Sat, 03 May 2008)
New Revision: 45062
URL: http://svn.boost.org/trac/boost/changeset/45062

Log:
Wave: Fixing the test application, which caused 2 regressions reported on non-Windows systems
Text files modified: 
   trunk/libs/wave/ChangeLog                      |     2 +-                                      
   trunk/libs/wave/test/testwave/testwave_app.cpp |    10 +++++++---                              
   2 files changed, 8 insertions(+), 4 deletions(-)

Modified: trunk/libs/wave/ChangeLog
==============================================================================
--- trunk/libs/wave/ChangeLog	(original)
+++ trunk/libs/wave/ChangeLog	2008-05-03 08:55:45 EDT (Sat, 03 May 2008)
@@ -41,7 +41,7 @@
   triggered an error in constructs like #ifndef __FILE__. Thanks to Daniel 
   Wadehn for reporting and supplying a patch. Added corresponding regression
   test: t_2_018.cpp.
-- Fixed a bug which reported a valid macro definition as invalid if the macro
+- Fixed a bug which reported a valid macro redefinition as invalid if the macro
   replacement text referred to a second or higher parameter of this macro.
 - Fixed a problem in the wave tool to allow two errors to occur while 
   preprocessing two consecutive tokens.

Modified: trunk/libs/wave/test/testwave/testwave_app.cpp
==============================================================================
--- trunk/libs/wave/test/testwave/testwave_app.cpp	(original)
+++ trunk/libs/wave/test/testwave/testwave_app.cpp	2008-05-03 08:55:45 EDT (Sat, 03 May 2008)
@@ -178,9 +178,13 @@
             case 'P':       // insert full path
             case 'B':       // same as 'P', but forward slashs on Windows
                 {
-                    fs::path fullpath = fs::complete(
-                        fs::path(filename, fs::native), 
-                        fs::current_path());
+                    fs::path fullpath;
+                    fs::path fn(filename, fs::native);
+                    
+                    if (!fn.is_complete())
+                        fullpath = fs::complete(fn, fs::current_path());
+                    else
+                        fullpath = fn;
                         
                     if ('(' == expected[pos1+2]) {
                     // the $P(basename) syntax is used