From: hartmut.kaiser_at_[hidden]
Date: 2008-05-03 12:16:05
Author: hkaiser
Date: 2008-05-03 12:16:05 EDT (Sat, 03 May 2008)
New Revision: 45071
URL: http://svn.boost.org/trac/boost/changeset/45071
Log:
Wave: Fixed regressions on non-Windows systems.
Text files modified:
trunk/boost/wave/util/cpp_include_paths.hpp | 4 ++--
trunk/libs/wave/test/testwave/testwave_app.cpp | 11 ++++-------
2 files changed, 6 insertions(+), 9 deletions(-)
Modified: trunk/boost/wave/util/cpp_include_paths.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_include_paths.hpp (original)
+++ trunk/boost/wave/util/cpp_include_paths.hpp 2008-05-03 12:16:05 EDT (Sat, 03 May 2008)
@@ -328,7 +328,7 @@
if (fs::exists(currpath)) {
fs::path dirpath (s, fs::native);
- if (!dirpath.has_root_name()) {
+ if (!dirpath.has_root_directory()) {
dirpath = fs::path((*it).second, fs::native);
dirpath /= fs::path(s, fs::native);
}
@@ -364,7 +364,7 @@
// if 0 != current_path (#include_next handling) it can't be
// the file in the current directory
fs::path dirpath (s, fs::native);
- if (!dirpath.has_root_name()) {
+ if (!dirpath.has_root_directory()) {
dirpath = fs::path(current_rel_dir.string(), fs::native);
dirpath /= fs::path(s, fs::native);
}
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 12:16:05 EDT (Sat, 03 May 2008)
@@ -178,13 +178,10 @@
case 'P': // insert full path
case 'B': // same as 'P', but forward slashs on Windows
{
- fs::path fullpath;
- fs::path fn(filename, fs::native);
-
- if (!fn.is_complete())
- fullpath = fs::complete(fn, fs::current_path());
- else
- fullpath = fn;
+ fs::path fullpath (
+ fs::complete(
+ fs::path(filename, fs::native), fs::current_path())
+ );
if ('(' == expected[pos1+2]) {
// the $P(basename) syntax is used