diff options
| author | Alex Zolotarev <alex@maps.me> | 2015-01-11 07:58:08 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:35:59 +0300 |
| commit | 42eecb6c9ead1a8ff39c2463e688c6a69222d3a1 (patch) | |
| tree | 6130bd68e5d15087ffb5b935c7db5857fa1f459e /3party/boost | |
| parent | f74bd1a270db8d699769a34e5f27dc7e10f4d6aa (diff) | |
Warning fixes
Diffstat (limited to '3party/boost')
| -rw-r--r-- | 3party/boost/libs/filesystem/src/operations.cpp | 36 | ||||
| -rw-r--r-- | 3party/boost/libs/filesystem/src/path.cpp | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/3party/boost/libs/filesystem/src/operations.cpp b/3party/boost/libs/filesystem/src/operations.cpp index cdfe48cfbe..0d7af353fa 100644 --- a/3party/boost/libs/filesystem/src/operations.cpp +++ b/3party/boost/libs/filesystem/src/operations.cpp @@ -247,7 +247,7 @@ namespace boost::filesystem::directory_iterator end_dir_itr; - const std::size_t buf_size(128); + //const std::size_t buf_size(128); const error_code ok; bool error(bool was_error, error_code* ec, const string& message) @@ -320,23 +320,23 @@ namespace return was_error; } - bool error(bool was_error, const error_code& result, - const path& p1, const path& p2, error_code* ec, const string& message) - // Overwrites ec if there has already been an error - { - if (!was_error) - { - if (ec != 0) ec->clear(); - } - else - { // error - if (ec == 0) - BOOST_FILESYSTEM_THROW(filesystem_error(message, p1, p2, result)); - else - *ec = result; - } - return was_error; - } +// bool error(bool was_error, const error_code& result, +// const path& p1, const path& p2, error_code* ec, const string& message) +// // Overwrites ec if there has already been an error +// { +// if (!was_error) +// { +// if (ec != 0) ec->clear(); +// } +// else +// { // error +// if (ec == 0) +// BOOST_FILESYSTEM_THROW(filesystem_error(message, p1, p2, result)); +// else +// *ec = result; +// } +// return was_error; +// } bool is_empty_directory(const path& p) { diff --git a/3party/boost/libs/filesystem/src/path.cpp b/3party/boost/libs/filesystem/src/path.cpp index 93b3dfbd78..97c38fb139 100644 --- a/3party/boost/libs/filesystem/src/path.cpp +++ b/3party/boost/libs/filesystem/src/path.cpp @@ -77,7 +77,7 @@ namespace typedef path::string_type string_type; typedef string_type::size_type size_type; - const std::size_t default_codecvt_buf_size = BOOST_FILESYSTEM_CODECVT_BUF_SIZE; + //const std::size_t default_codecvt_buf_size = BOOST_FILESYSTEM_CODECVT_BUF_SIZE; # ifdef BOOST_WINDOWS_API |