Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-14 18:35:17 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-03-14 18:35:17 (GMT) |
| commit | a135c6ff4dcded5661a2321512960b14cf8c15c8 (patch) | |
| tree | b0017ecfe702304f592b9d4e8b943784cff26fb2 /3rdParty/Boost/src/tools/bcp/main.cpp | |
| parent | 02d6188ab335e6c62b8341b84579d9549d215118 (diff) | |
| download | swift-a135c6ff4dcded5661a2321512960b14cf8c15c8.zip swift-a135c6ff4dcded5661a2321512960b14cf8c15c8.tar.bz2 | |
Updated Boost to 1.46.1.
This should hopefuily fix a hang on shutdown on Mac OS X.
Resolves: #782
Release-Notes: Fixed a potential hang on shutdown on Mac OS X.
Diffstat (limited to '3rdParty/Boost/src/tools/bcp/main.cpp')
| -rw-r--r-- | 3rdParty/Boost/src/tools/bcp/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/tools/bcp/main.cpp b/3rdParty/Boost/src/tools/bcp/main.cpp index a152138..28a5491 100644 --- a/3rdParty/Boost/src/tools/bcp/main.cpp +++ b/3rdParty/Boost/src/tools/bcp/main.cpp @@ -13,9 +13,9 @@ #include <cstring> #include <string> #include <list> +#include "bcp.hpp" #include <boost/filesystem/path.hpp> #include <boost/version.hpp> -#include "bcp.hpp" #ifdef BOOST_NO_STDC_NAMESPACE namespace std{ @@ -60,7 +60,7 @@ int cpp_main(int argc, char* argv[]) // with files that already exist, if they're not portable // names it's too late for us to do anything about it). // - boost::filesystem::path::default_name_check(filesystem_name_check); + /*boost::filesystem::path::default_name_check(filesystem_name_check);*/ // // without arguments just show help: // @@ -68,7 +68,7 @@ int cpp_main(int argc, char* argv[]) { std::cout << "Error: insufficient arguments, don't know what to do." << std::endl; show_usage(); - return 0; + return 1; } // // create the application object: |