Swiftdiff 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/ratio/config.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-contrib-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/ratio/config.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/ratio/config.hpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/3rdParty/Boost/src/boost/ratio/config.hpp b/3rdParty/Boost/src/boost/ratio/config.hpp index 67a60fc..992a256 100644 --- a/3rdParty/Boost/src/boost/ratio/config.hpp +++ b/3rdParty/Boost/src/boost/ratio/config.hpp @@ -17,70 +17,76 @@ # if ! defined BOOST_NO_CXX11_U16STRING # define BOOST_NO_CXX11_U16STRING # endif # if ! defined BOOST_NO_CXX11_U32STRING # define BOOST_NO_CXX11_U32STRING # endif #endif #if !defined BOOST_RATIO_VERSION #define BOOST_RATIO_VERSION 1 #else #if BOOST_RATIO_VERSION!=1 && BOOST_RATIO_VERSION!=2 #error "BOOST_RATIO_VERSION must be 1 or 2" #endif #endif #if BOOST_RATIO_VERSION==1 #if ! defined BOOST_RATIO_DONT_PROVIDE_DEPRECATED_FEATURES_SINCE_V2_0_0 #define BOOST_RATIO_PROVIDES_DEPRECATED_FEATURES_SINCE_V2_0_0 #endif #endif #if BOOST_RATIO_VERSION==2 #if ! defined BOOST_RATIO_PROVIDES_DEPRECATED_FEATURES_SINCE_V2_0_0 #define BOOST_RATIO_DONT_PROVIDE_DEPRECATED_FEATURES_SINCE_V2_0_0 #endif #endif #ifdef INTMAX_C #define BOOST_RATIO_INTMAX_C(a) INTMAX_C(a) #else #define BOOST_RATIO_INTMAX_C(a) a##LL #endif +#ifdef UINTMAX_C +#define BOOST_RATIO_UINTMAX_C(a) UINTMAX_C(a) +#else +#define BOOST_RATIO_UINTMAX_C(a) a##ULL +#endif + #define BOOST_RATIO_INTMAX_T_MAX (0x7FFFFFFFFFFFFFFELL) #ifndef BOOST_NO_CXX11_STATIC_ASSERT #define BOOST_RATIO_STATIC_ASSERT(CND, MSG, TYPES) static_assert(CND,MSG) #elif defined(BOOST_RATIO_USES_STATIC_ASSERT) #include <boost/static_assert.hpp> #define BOOST_RATIO_STATIC_ASSERT(CND, MSG, TYPES) BOOST_STATIC_ASSERT(CND) #elif defined(BOOST_RATIO_USES_MPL_ASSERT) #include <boost/mpl/assert.hpp> #include <boost/mpl/bool.hpp> #define BOOST_RATIO_STATIC_ASSERT(CND, MSG, TYPES) \ BOOST_MPL_ASSERT_MSG(boost::mpl::bool_< (CND) >::type::value, MSG, TYPES) #else //~ #elif defined(BOOST_RATIO_USES_ARRAY_ASSERT) #define BOOST_RATIO_CONCAT(A,B) A##B #define BOOST_RATIO_NAME(A,B) BOOST_RATIO_CONCAT(A,B) #define BOOST_RATIO_STATIC_ASSERT(CND, MSG, TYPES) static char BOOST_RATIO_NAME(__boost_ratio_test_,__LINE__)[(CND)?1:-1] //~ #define BOOST_RATIO_STATIC_ASSERT(CND, MSG, TYPES) #endif #if !defined(BOOST_NO_CXX11_STATIC_ASSERT) || !defined(BOOST_RATIO_USES_MPL_ASSERT) #define BOOST_RATIO_OVERFLOW_IN_ADD "overflow in ratio add" #define BOOST_RATIO_OVERFLOW_IN_SUB "overflow in ratio sub" #define BOOST_RATIO_OVERFLOW_IN_MUL "overflow in ratio mul" #define BOOST_RATIO_OVERFLOW_IN_DIV "overflow in ratio div" #define BOOST_RATIO_NUMERATOR_IS_OUT_OF_RANGE "ratio numerator is out of range" #define BOOST_RATIO_DIVIDE_BY_0 "ratio divide by 0" #define BOOST_RATIO_DENOMINATOR_IS_OUT_OF_RANGE "ratio denominator is out of range" #endif //#define BOOST_RATIO_EXTENSIONS #endif // header |