boost/filesystem
2
0
Fork 0
mirror of https://github.com/boostorg/filesystem.git synced 2026-01-30 20:02:10 +00:00
Code Issues Projects Releases Wiki Activity

VC++ 6.0, 7.0 now working

Browse Source 
[SVN r30961]
This commit is contained in:
Beman Dawes
2005-09-13 20:20:47 +00:00
parent d7bd7c6991
commit e04ccfcf2d
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/boost/filesystem/path.hpp
View File

@@ -231,17 +231,21 @@ namespace boost
basic_path() {}
basic_path( const string_type & s, path_format_t = portable ) { operator/=( s ); }
basic_path( const value_type * s, path_format_t = portable ) { operator/=( s ); }
template <class InputIterator>
basic_path( InputIterator first, InputIterator last,
path_format_t fmt=portable ) { append( first, last, fmt ); }
# ifndef BOOST_NO_MEMBER_TEMPLATES
template <class InputIterator>
basic_path( InputIterator first, InputIterator last,
path_format_t fmt=portable ) { append( first, last, fmt ); }
# endif
~basic_path() {}
// assignments
basic_path & operator=( const string_type & s ) { m_path.clear(); operator/=( s ); return *this; }
basic_path & operator=( const value_type * s ) { m_path.clear(); operator/=( s ); return *this; }
template <class InputIterator>
basic_path & assign( InputIterator first, InputIterator last,
path_format_t fmt = portable ) { m_path.clear(); append( first, last, fmt ); return *this; }
basic_path & operator=( const string_type & s ) { m_path=""; operator/=( s ); return *this; }
basic_path & operator=( const value_type * s ) { m_path=""; operator/=( s ); return *this; }
# ifndef BOOST_NO_MEMBER_TEMPLATES
template <class InputIterator>
basic_path & assign( InputIterator first, InputIterator last,
path_format_t fmt = portable ) { m_path.clear(); append( first, last, fmt ); return *this; }
# endif
// comparisons
// overloads for string_type and value_type* are not provided because
@@ -259,8 +263,10 @@ namespace boost
basic_path & operator/=( const basic_path & rhs ) { return operator /=( rhs.string().c_str() ); }
basic_path & operator/=( const string_type & rhs ) { return operator /=( rhs.c_str() ); }
basic_path & operator/=( const value_type * s );
template <class InputIterator>
basic_path & append( InputIterator first, InputIterator last, path_format_t fmt=portable );
# ifndef BOOST_NO_MEMBER_TEMPLATES
template <class InputIterator>
basic_path & append( InputIterator first, InputIterator last, path_format_t fmt=portable );
# endif
basic_path & remove_leaf();
@@ -292,9 +298,11 @@ namespace boost
basic_path operator/( const basic_path & rhs ) const { return basic_path<String, Traits>( *this ) /= rhs; }
basic_path operator/( const string_type & rhs ) const { return basic_path<String, Traits>( *this ) /= rhs; }
basic_path operator/( const value_type * rhs ) const { return basic_path<String, Traits>( *this ) /= rhs; }
template <class InputIterator>
basic_path concat( InputIterator first, InputIterator last,
path_format_t fmt=portable) { return basic_path<String, Traits>( *this ).append( first, last, fmt ); }
# ifndef BOOST_NO_MEMBER_TEMPLATES
template <class InputIterator>
basic_path concat( InputIterator first, InputIterator last,
path_format_t fmt=portable) { return basic_path<String, Traits>( *this ).append( first, last, fmt ); }
# endif
// iterators
class iterator : public boost::iterator_facade<
@@ -748,6 +756,7 @@ namespace boost
return *this;
}
# ifndef BOOST_NO_MEMBER_TEMPLATES
template<class String, class Traits> template <class InputIterator>
basic_path<String, Traits> & basic_path<String, Traits>::append(
InputIterator first, InputIterator last, path_format_t )
@@ -758,7 +767,7 @@ namespace boost
for ( ; first != last; ++first ) m_append( *first );
return *this;
}
# endif
/*
// canonize ------------------------------------------------------------//

7
test/operations_test.cpp
View File

@@ -223,9 +223,10 @@ int test_main( int argc, char * argv[] )
BOOST_CHECK( sizeof( boost::uintmax_t ) >= 8 );
BOOST_CHECK( fs::space( dir ).available > 1000 ); // reasonable assumption
BOOST_CHECK( fs::space( dir ).total > 1000000 ); // reasonable assumption
std::cout << "space().available = " << fs::space( dir ).available << '\n';
std::cout << "space().total = " << fs::space( dir ).total << '\n';
# if !defined(BOOST_MSVC) || _MSC_VER >= 1300 // 1300 == VC++ 7.0
std::cout << "space().available = " << fs::space( dir ).available << '\n';
std::cout << "space().total = " << fs::space( dir ).total << '\n';
# endif
BOOST_CHECK( fs::exists( dir ) );
BOOST_CHECK( BOOST_FS_IS_EMPTY( dir ) );
BOOST_CHECK( fs::is_directory( dir ) );

4
test/path_test.cpp
View File

@@ -232,8 +232,10 @@ int test_main( int, char*[] )
p4 /= path( "foo" );
p4 /= "foo";
p4 /= std::string( "foo" );
# ifndef BOOST_NO_MEMBER_TEMPLATES
BOOST_CHECK( p4.string() == path( p4.string().begin(), p4.string().end() ).string() );
# endif
BOOST_CHECK( p1 != p4 );
BOOST_CHECK( p1.string() == p2.string() );
BOOST_CHECK( p1.string() == p3.string() );