diff options
author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/format/format_fwd.hpp | |
parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/format/format_fwd.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/format/format_fwd.hpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/3rdParty/Boost/src/boost/format/format_fwd.hpp b/3rdParty/Boost/src/boost/format/format_fwd.hpp index be3228a..16b8565 100644 --- a/3rdParty/Boost/src/boost/format/format_fwd.hpp +++ b/3rdParty/Boost/src/boost/format/format_fwd.hpp @@ -21,18 +21,12 @@ namespace boost { template <class Ch, -#if !( BOOST_WORKAROUND(__GNUC__, <3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) ) - // gcc-2.95's native stdlid needs special treatment - class Tr = BOOST_IO_STD char_traits<Ch>, class Alloc = std::allocator<Ch> > -#else - class Tr = std::string_char_traits<Ch>, class Alloc = std::alloc > -#endif + class Tr = BOOST_IO_STD char_traits<Ch>, class Alloc = std::allocator<Ch> > class basic_format; typedef basic_format<char > format; -#if !defined(BOOST_NO_STD_WSTRING) && !defined(BOOST_NO_STD_WSTREAMBUF) \ - && !defined(BOOST_FORMAT_IGNORE_STRINGSTREAM) +#if !defined(BOOST_NO_STD_WSTRING) && !defined(BOOST_NO_STD_WSTREAMBUF) typedef basic_format<wchar_t > wformat; #endif |