mirror of
https://github.com/boostorg/filesystem.git
synced 2026-01-28 19:22:09 +00:00
suppress warnings, add missing thow_exception call (Lars Gullik Bjønnes)
[SVN r21569]
This commit is contained in:
@@ -47,10 +47,10 @@ namespace fs = boost::filesystem;
|
||||
|
||||
namespace
|
||||
{
|
||||
# ifdef BOOST_WINDOWS
|
||||
std::string system_message( int sys_err_code )
|
||||
{
|
||||
std::string str;
|
||||
# ifdef BOOST_WINDOWS
|
||||
LPVOID lpMsgBuf;
|
||||
::FormatMessageA(
|
||||
FORMAT_MESSAGE_ALLOCATE_BUFFER |
|
||||
@@ -68,11 +68,16 @@ namespace
|
||||
while ( str.size()
|
||||
&& (str[str.size()-1] == '\n' || str[str.size()-1] == '\r') )
|
||||
str.erase( str.size()-1 );
|
||||
# else
|
||||
str += std::strerror( errno );
|
||||
# endif
|
||||
return str;
|
||||
}
|
||||
# else
|
||||
std::string system_message( int )
|
||||
{
|
||||
std::string str;
|
||||
str += std::strerror( errno );
|
||||
return str;
|
||||
}
|
||||
# endif
|
||||
|
||||
struct ec_xlate { int sys_ec; fs::error_code ec; };
|
||||
const ec_xlate ec_table[] =
|
||||
|
||||
@@ -451,7 +451,7 @@ namespace boost
|
||||
|
||||
const std::size_t buf_sz = 32768;
|
||||
boost::scoped_array<char> buf( new char [buf_sz] );
|
||||
int infile, outfile=0; // init quiets compiler warning
|
||||
int infile=0, outfile=0; // init quiets compiler warning
|
||||
struct stat from_stat;
|
||||
|
||||
if ( ::stat( from_file_ph.string().c_str(), &from_stat ) != 0
|
||||
|
||||
@@ -131,14 +131,17 @@ namespace boost
|
||||
{
|
||||
// name_check functions ----------------------------------------------//
|
||||
|
||||
# ifdef BOOST_WINDOWS
|
||||
BOOST_FILESYSTEM_DECL bool native( const std::string & name )
|
||||
{
|
||||
# ifdef BOOST_WINDOWS
|
||||
return windows_name( name );
|
||||
# else
|
||||
return true;
|
||||
# endif
|
||||
}
|
||||
# else
|
||||
BOOST_FILESYSTEM_DECL bool native( const std::string & )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
# endif
|
||||
|
||||
BOOST_FILESYSTEM_DECL bool no_check( const std::string & ) { return true; }
|
||||
|
||||
@@ -611,8 +614,9 @@ namespace boost
|
||||
{
|
||||
assert( new_check );
|
||||
if ( !safe_to_write_check )
|
||||
throw filesystem_error( "boost::filesystem::default_name_check",
|
||||
"default name check already set" );
|
||||
boost::throw_exception(
|
||||
filesystem_error( "boost::filesystem::default_name_check",
|
||||
"default name check already set" ));
|
||||
default_check = new_check;
|
||||
safe_to_write_check = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user