diff options
Diffstat (limited to 'boost/filesystem/path_traits.hpp')
| -rw-r--r-- | boost/filesystem/path_traits.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/boost/filesystem/path_traits.hpp b/boost/filesystem/path_traits.hpp index 129044a469..48a0f12183 100644 --- a/boost/filesystem/path_traits.hpp +++ b/boost/filesystem/path_traits.hpp @@ -17,10 +17,10 @@ # endif #include <boost/filesystem/config.hpp> -#include <boost/utility/enable_if.hpp> #include <boost/type_traits/is_array.hpp> #include <boost/type_traits/decay.hpp> #include <boost/system/error_code.hpp> +#include <boost/core/enable_if.hpp> #include <cwchar> // for mbstate_t #include <string> #include <vector> @@ -46,9 +46,9 @@ namespace boost { namespace filesystem { // conversion was necessary. class directory_entry; - + namespace path_traits { - + typedef std::codecvt<wchar_t, char, std::mbstate_t> codecvt_type; // is_pathable type trait; allows disabling over-agressive class path member templates @@ -72,7 +72,7 @@ namespace path_traits { template <class Container> inline // disable_if aids broken compilers (IBM, old GCC, etc.) and is harmless for - // conforming compilers. Replace by plain "bool" at some future date (2012?) + // conforming compilers. Replace by plain "bool" at some future date (2012?) typename boost::disable_if<boost::is_array<Container>, bool>::type empty(const Container & c) { return c.begin() == c.end(); } @@ -277,7 +277,7 @@ namespace path_traits { // non-contiguous containers with codecvt template <class Container, class U> inline // disable_if aids broken compilers (IBM, old GCC, etc.) and is harmless for - // conforming compilers. Replace by plain "void" at some future date (2012?) + // conforming compilers. Replace by plain "void" at some future date (2012?) typename boost::disable_if<boost::is_array<Container>, void>::type dispatch(const Container & c, U& to, const codecvt_type& cvt) { @@ -298,13 +298,13 @@ namespace path_traits { } // Note: there is no dispatch on C-style arrays because the array may - // contain a string smaller than the array size. + // contain a string smaller than the array size. BOOST_FILESYSTEM_DECL void dispatch(const directory_entry & de, # ifdef BOOST_WINDOWS_API std::wstring & to, -# else +# else std::string & to, # endif const codecvt_type&); @@ -312,7 +312,7 @@ namespace path_traits { // non-contiguous containers without codecvt template <class Container, class U> inline // disable_if aids broken compilers (IBM, old GCC, etc.) and is harmless for - // conforming compilers. Replace by plain "void" at some future date (2012?) + // conforming compilers. Replace by plain "void" at some future date (2012?) typename boost::disable_if<boost::is_array<Container>, void>::type dispatch(const Container & c, U& to) { @@ -333,13 +333,13 @@ namespace path_traits { } // Note: there is no dispatch on C-style arrays because the array may - // contain a string smaller than the array size. + // contain a string smaller than the array size. BOOST_FILESYSTEM_DECL void dispatch(const directory_entry & de, # ifdef BOOST_WINDOWS_API std::wstring & to -# else +# else std::string & to # endif ); |