From: <bl...@us...> - 2003-05-10 15:17:35
|
Update of /cvsroot/cpptool/rfta/deplib/boostcvs/boost/filesystem In directory sc8-pr-cvs1:/tmp/cvs-serv22050/boost/filesystem Modified Files: convenience.hpp exception.hpp fstream.hpp Log Message: * updated to the current boost cvs (2003/05/10) Index: convenience.hpp =================================================================== RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/boost/filesystem/convenience.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** convenience.hpp 5 Apr 2003 11:23:22 -0000 1.1 --- convenience.hpp 10 May 2003 15:17:32 -0000 1.2 *************** *** 32,35 **** --- 32,41 ---- void create_directories(const path& ph); + std::string extension(const path& ph); + + std::string basename(const path& ph); + + path change_extension(const path& ph, const std::string& new_extension); + } // namespace filesystem } // namespace boost Index: exception.hpp =================================================================== RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/boost/filesystem/exception.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** exception.hpp 1 Apr 2003 08:25:42 -0000 1.2 --- exception.hpp 10 May 2003 15:17:32 -0000 1.3 *************** *** 24,28 **** #include <string> ! #include <stdexcept> //----------------------------------------------------------------------------// --- 24,29 ---- #include <string> ! #include <exception> ! #include <boost/shared_ptr.hpp> //----------------------------------------------------------------------------// *************** *** 59,63 **** ! class filesystem_error : public std::runtime_error { public: --- 60,64 ---- ! class filesystem_error : public std::exception { public: *************** *** 85,88 **** --- 86,91 ---- ~filesystem_error() throw(); + virtual const char * what() const throw(); + int native_error() const { return m_sys_err; } // Note: a value of 0 implies a library (rather than system) error *************** *** 93,101 **** private: ! int m_sys_err; ! error_code m_err; ! std::string m_who; ! path m_path1; ! path m_path2; }; --- 96,103 ---- private: ! class m_imp; ! shared_ptr<m_imp> m_imp_ptr; ! int m_sys_err; ! error_code m_err; }; Index: fstream.hpp =================================================================== RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/boost/filesystem/fstream.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fstream.hpp 1 Apr 2003 08:25:44 -0000 1.2 --- fstream.hpp 10 May 2003 15:17:32 -0000 1.3 *************** *** 14,17 **** --- 14,18 ---- #include <boost/filesystem/path.hpp> + #include <boost/detail/workaround.hpp> #include <iosfwd> *************** *** 27,32 **** public: virtual ~basic_filebuf() {} ! ! #if !defined(BOOST_MSVC) || BOOST_MSVC > 1200 // VC++ 6.0 can't handle this std::basic_filebuf<charT,traits> * open( const path & file_ph, std::ios_base::openmode mode ) --- 28,32 ---- public: virtual ~basic_filebuf() {} ! #if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this std::basic_filebuf<charT,traits> * open( const path & file_ph, std::ios_base::openmode mode ) *************** *** 48,57 **** public: basic_ifstream() {} explicit basic_ifstream( const path & file_ph, std::ios_base::openmode mode = std::ios_base::in ) : std::basic_ifstream<charT,traits>( file_ph.native_file_string().c_str(), mode ) {} ! virtual ~basic_ifstream() {} ! #if !defined(BOOST_MSVC) || BOOST_MSVC > 1200 // VC++ 6.0 can't handle this void open( const path & file_ph, std::ios_base::openmode mode = std::ios_base::in ) --- 48,57 ---- public: basic_ifstream() {} + #if !BOOST_WORKAROUND( BOOST_MSVC, == 1310 ) explicit basic_ifstream( const path & file_ph, std::ios_base::openmode mode = std::ios_base::in ) : std::basic_ifstream<charT,traits>( file_ph.native_file_string().c_str(), mode ) {} ! # if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this void open( const path & file_ph, std::ios_base::openmode mode = std::ios_base::in ) *************** *** 60,64 **** --- 60,85 ---- file_ph.native_file_string().c_str(), mode ); } + # endif + #else // workaround for VC++ 7.1 bug id VSWhidbey 38416 + explicit basic_ifstream( const path & file_ph ) + : std::basic_ifstream<charT,traits>( + file_ph.native_file_string().c_str(), std::ios_base::in ) {} + basic_ifstream( const path & file_ph, + std::ios_base::openmode mode ) + : std::basic_ifstream<charT,traits>( + file_ph.native_file_string().c_str(), mode ) {} + void open( const path & file_ph ) + { + std::basic_ifstream<charT,traits>::open( + file_ph.native_file_string().c_str(), std::ios_base::in ); + } + void open( const path & file_ph, + std::ios_base::openmode mode ) + { + std::basic_ifstream<charT,traits>::open( + file_ph.native_file_string().c_str(), mode ); + } #endif + virtual ~basic_ifstream() {} }; *************** *** 73,82 **** public: basic_ofstream() {} explicit basic_ofstream( const path & file_ph, std::ios_base::openmode mode = std::ios_base::out ) : std::basic_ofstream<charT,traits>( file_ph.native_file_string().c_str(), mode ) {} ! virtual ~basic_ofstream() {} ! #if !defined(BOOST_MSVC) || BOOST_MSVC > 1200 // VC++ 6.0 can't handle this void open( const path & file_ph, std::ios_base::openmode mode = std::ios_base::out ) --- 94,103 ---- public: basic_ofstream() {} + #if !BOOST_WORKAROUND( BOOST_MSVC, == 1310 ) explicit basic_ofstream( const path & file_ph, std::ios_base::openmode mode = std::ios_base::out ) : std::basic_ofstream<charT,traits>( file_ph.native_file_string().c_str(), mode ) {} ! # if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this void open( const path & file_ph, std::ios_base::openmode mode = std::ios_base::out ) *************** *** 85,89 **** --- 106,131 ---- file_ph.native_file_string().c_str(), mode ); } + # endif + #else // workaround for VC++ 7.1 bug id VSWhidbey 38416 + explicit basic_ofstream( const path & file_ph ) + : std::basic_ofstream<charT,traits>( + file_ph.native_file_string().c_str(), std::ios_base::out ) {} + basic_ofstream( const path & file_ph, + std::ios_base::openmode mode ) + : std::basic_ofstream<charT,traits>( + file_ph.native_file_string().c_str(), mode ) {} + void open( const path & file_ph ) + { + std::basic_ofstream<charT,traits>::open( + file_ph.native_file_string().c_str(), std::ios_base::out ); + } + void open( const path & file_ph, + std::ios_base::openmode mode ) + { + std::basic_ofstream<charT,traits>::open( + file_ph.native_file_string().c_str(), mode ); + } #endif + virtual ~basic_ofstream() {} }; *************** *** 98,107 **** public: basic_fstream() {} explicit basic_fstream( const path & file_ph, std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out ) : std::basic_fstream<charT,traits>( file_ph.native_file_string().c_str(), mode ) {} ! virtual ~basic_fstream() {} ! #if !defined(BOOST_MSVC) || BOOST_MSVC > 1200 // VC++ 6.0 can't handle this void open( const path & file_ph, std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out ) --- 140,149 ---- public: basic_fstream() {} + #if !BOOST_WORKAROUND( BOOST_MSVC, == 1310 ) explicit basic_fstream( const path & file_ph, std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out ) : std::basic_fstream<charT,traits>( file_ph.native_file_string().c_str(), mode ) {} ! # if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this void open( const path & file_ph, std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out ) *************** *** 110,114 **** --- 152,179 ---- file_ph.native_file_string().c_str(), mode ); } + # endif + #else // workaround for VC++ 7.1 bug id VSWhidbey 38416 + explicit basic_fstream( const path & file_ph ) + : std::basic_fstream<charT,traits>( + file_ph.native_file_string().c_str(), + std::ios_base::in|std::ios_base::out ) {} + basic_fstream( const path & file_ph, + std::ios_base::openmode mode ) + : std::basic_fstream<charT,traits>( + file_ph.native_file_string().c_str(), mode ) {} + void open( const path & file_ph ) + { + std::basic_fstream<charT,traits>::open( + file_ph.native_file_string().c_str(), + std::ios_base::in|std::ios_base::out ); + } + void open( const path & file_ph, + std::ios_base::openmode mode ) + { + std::basic_fstream<charT,traits>::open( + file_ph.native_file_string().c_str(), mode ); + } #endif + virtual ~basic_fstream() {} }; |