Subject: [Boost-commit] svn:boost r68655 - branches/quickbook-filenames/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2011-02-05 10:41:57
Author: danieljames
Date: 2011-02-05 10:41:55 EST (Sat, 05 Feb 2011)
New Revision: 68655
URL: http://svn.boost.org/trac/boost/changeset/68655
Log:
Fix rooted path handling on windows.
Was using `!path.is_complete()` to check if a path is relative - this
doesn't work on windows since paths like `\a\b` and `c:foo` aren't
complete or absolute. So now use
`!path.has_root_directory && !path.has_root_name()` instead.
Text files modified:
branches/quickbook-filenames/tools/quickbook/src/actions.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Modified: branches/quickbook-filenames/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/actions.cpp (original)
+++ branches/quickbook-filenames/tools/quickbook/src/actions.cpp 2011-02-05 10:41:55 EST (Sat, 05 Feb 2011)
@@ -1360,7 +1360,7 @@
// path to the source file relative to the output directory.
fs::path path = detail::generic_to_path(name);
- if (!path.is_complete())
+ if (!path.has_root_directory())
{
fs::path infile = fs::absolute(actions.filename).normalize();
path = (infile.parent_path() / path).normalize();
@@ -1387,7 +1387,7 @@
fs::path path(name);
// If the path is relative, try and resolve it.
- if (!path.is_complete())
+ if (!path.has_root_directory())
{
// See if it can be found locally first.
if (fs::exists(current / path))