diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-16 11:07:36 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-16 11:07:36 -0500 |
| commit | eca0637d153e3a9bde563c9521098a7577ba5975 (patch) | |
| tree | 86024d9e830bca4c8a2820981151d31f01e63c4a | |
| parent | 185169cbbecebe2a35dbd937d6fb4e0a30fa1832 (diff) | |
| parent | 12a3f2ea72893827a3b34e2f95b462387e844c9d (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
| -rw-r--r-- | autobuild.xml | 12 | ||||
| -rw-r--r-- | indra/cmake/Boost.cmake | 2 | ||||
| -rw-r--r-- | indra/llvfs/lldiriterator.cpp | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/autobuild.xml b/autobuild.xml index 9a92614dfd..b60f2137a1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -186,9 +186,9 @@ <key>archive</key> <map> <key>hash</key> - <string>36aa500e13cdde61607b6e93065206ec</string> + <string>f01fb9e6b7e843b6d1179c88a5f77da2</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/261457/arch/Darwin/installer/boost-1.48.0-darwin-20120710.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/267082/arch/Darwin/installer/boost-1.52.0-darwin-20121115.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -198,9 +198,9 @@ <key>archive</key> <map> <key>hash</key> - <string>18602d44bd435eb0d7189f436ff2cb0f</string> + <string>3f8d67c43bad126dbc77b863cc232e09</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/261457/arch/Linux/installer/boost-1.48.0-linux-20120710.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/267082/arch/Linux/installer/boost-1.52.0-linux-20121116.tar.bz2</string> </map> <key>name</key> <string>linux</string> @@ -210,9 +210,9 @@ <key>archive</key> <map> <key>hash</key> - <string>dc8f5dc6be04c64bf3460b4932b18457</string> + <string>e32bb4bc1254003f4c651208e24d3cbd</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/261457/arch/CYGWIN/installer/boost-1.48.0-windows-20120710.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/267082/arch/CYGWIN/installer/boost-1.52.0-windows-20121115.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 2af0bc1b30..dfa59bcb7e 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -18,8 +18,8 @@ else (STANDALONE) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (WINDOWS) - set(BOOST_VERSION 1_48) if(MSVC80) + set(BOOST_VERSION 1_52) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc80-mt-${BOOST_VERSION} debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index ff92cbb7fd..fa806bf23e 100644 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp @@ -59,7 +59,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) { is_dir = fs::is_directory(dir_path); } - catch (fs::basic_filesystem_error<fs::path>& e) + catch (const fs::filesystem_error& e) { llwarns << e.what() << llendl; return; @@ -76,7 +76,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) { mIter = fs::directory_iterator(dir_path); } - catch (fs::basic_filesystem_error<fs::path>& e) + catch (const fs::filesystem_error& e) { llwarns << e.what() << llendl; return; @@ -121,7 +121,7 @@ bool LLDirIterator::Impl::next(std::string &fname) while (mIter != end_itr && !found) { boost::smatch match; - std::string name = mIter->path().filename(); + std::string name = mIter->path().filename().string(); if (found = boost::regex_match(name, match, mFilterExp)) { fname = name; |