From: bdawes_at_[hidden]
Date: 2007-10-07 17:59:47
Author: bemandawes
Date: 2007-10-07 17:59:46 EDT (Sun, 07 Oct 2007)
New Revision: 39772
URL: http://svn.boost.org/trac/boost/changeset/39772
Log:
Appy Godegear patches from Nicola Musatti. Ticket #1304
Text files modified:
trunk/boost/filesystem/config.hpp | 3 ++-
trunk/boost/filesystem/path.hpp | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
Modified: trunk/boost/filesystem/config.hpp
==============================================================================
--- trunk/boost/filesystem/config.hpp (original)
+++ trunk/boost/filesystem/config.hpp 2007-10-07 17:59:46 EDT (Sun, 07 Oct 2007)
@@ -23,6 +23,7 @@
// http://www.boost.org/more/separate_compilation.html
#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
// determine platform ------------------------------------------------------//
@@ -59,7 +60,7 @@
// narrow support only for badly broken compilers or libraries -------------//
-# if defined(BOOST_NO_STD_WSTRING) || defined(BOOST_NO_SFINAE) || defined(BOOST_NO_STD_LOCALE)
+# if defined(BOOST_NO_STD_WSTRING) || defined(BOOST_NO_SFINAE) || defined(BOOST_NO_STD_LOCALE) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
# define BOOST_FILESYSTEM_NARROW_ONLY
# endif
Modified: trunk/boost/filesystem/path.hpp
==============================================================================
--- trunk/boost/filesystem/path.hpp (original)
+++ trunk/boost/filesystem/path.hpp 2007-10-07 17:59:46 EDT (Sun, 07 Oct 2007)
@@ -649,8 +649,8 @@
const char * what() const throw()
{
if ( !m_imp_ptr.get() )
- return system_error::what();
- return detail::what( system_error::what(), m_imp_ptr->m_path1,
+ return system::system_error::what();
+ return detail::what( system::system_error::what(), m_imp_ptr->m_path1,
m_imp_ptr->m_path2, m_imp_ptr->m_what );
}
@@ -1386,7 +1386,7 @@
template<class Path>
basic_filesystem_error<Path>::basic_filesystem_error(
const std::string & what, system::error_code ec )
- : system_error(ec, what)
+ : system::system_error(ec, what)
{
try
{
@@ -1399,7 +1399,7 @@
basic_filesystem_error<Path>::basic_filesystem_error(
const std::string & what, const path_type & path1,
system::error_code ec )
- : system_error(ec, what)
+ : system::system_error(ec, what)
{
try
{
@@ -1413,7 +1413,7 @@
basic_filesystem_error<Path>::basic_filesystem_error(
const std::string & what, const path_type & path1,
const path_type & path2, system::error_code ec )
- : system_error(ec, what)
+ : system::system_error(ec, what)
{
try
{