Subject: [Boost-commit] svn:boost r62876 - branches/filesystem3/boost/filesystem/v2
From: bdawes_at_[hidden]
Date: 2010-06-12 16:44:24
Author: bemandawes
Date: 2010-06-12 16:44:23 EDT (Sat, 12 Jun 2010)
New Revision: 62876
URL: http://svn.boost.org/trac/boost/changeset/62876
Log:
Fix #3241
Text files modified:
branches/filesystem3/boost/filesystem/v2/convenience.hpp | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
Modified: branches/filesystem3/boost/filesystem/v2/convenience.hpp
==============================================================================
--- branches/filesystem3/boost/filesystem/v2/convenience.hpp (original)
+++ branches/filesystem3/boost/filesystem/v2/convenience.hpp 2010-06-12 16:44:23 EDT (Sat, 12 Jun 2010)
@@ -81,8 +81,15 @@
BOOST_FS_FUNC(Path) change_extension( const Path & ph,
const BOOST_FS_TYPENAME Path::string_type & new_extension )
- { return ph.parent_path() / (basename(ph) + new_extension); }
-
+ {
+# if !defined(_STLPORT_VERSION)
+ return ph.parent_path() / (basename(ph) + new_extension);
+# else
+ typedef BOOST_FS_TYPENAME Path::string_type string_type;
+ string_type filename = basename(ph) + new_extension;
+ return ph.parent_path() / filename;
+# endif
+ }
# endif
# ifndef BOOST_FILESYSTEM_NARROW_ONLY