Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/detail')
| -rw-r--r-- | 3rdParty/Boost/src/boost/detail/endian.hpp | 7 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/detail/sp_typeinfo.hpp | 8 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/detail/workaround.hpp | 5 |
3 files changed, 17 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/boost/detail/endian.hpp b/3rdParty/Boost/src/boost/detail/endian.hpp index 36ddb7e..5f9b90e 100644 --- a/3rdParty/Boost/src/boost/detail/endian.hpp +++ b/3rdParty/Boost/src/boost/detail/endian.hpp @@ -1,5 +1,6 @@ // Copyright 2005 Caleb Epstein // Copyright 2006 John Maddock +// Copyright 2010 Rene Rivera // Distributed under the Boost Software License, Version 1.0. (See accompany- // ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -42,10 +43,12 @@ # error Unknown machine endianness detected. # endif # define BOOST_BYTE_ORDER __BYTE_ORDER -#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) +#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) || \ + defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) # define BOOST_BIG_ENDIAN # define BOOST_BYTE_ORDER 4321 -#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) +#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) || \ + defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) # define BOOST_LITTLE_ENDIAN # define BOOST_BYTE_ORDER 1234 #elif defined(__sparc) || defined(__sparc__) \ diff --git a/3rdParty/Boost/src/boost/detail/sp_typeinfo.hpp b/3rdParty/Boost/src/boost/detail/sp_typeinfo.hpp index 636fe27..43fae78 100644 --- a/3rdParty/Boost/src/boost/detail/sp_typeinfo.hpp +++ b/3rdParty/Boost/src/boost/detail/sp_typeinfo.hpp @@ -74,7 +74,13 @@ template<class T> struct sp_typeid_ } }; -template<class T> sp_typeinfo sp_typeid_< T >::ti_( sp_typeid_< T >::name() ); +#if defined(__SUNPRO_CC) +// see #4199, the Sun Studio compiler gets confused about static initialization +// constructor arguments. But an assignment works just fine. +template<class T> sp_typeinfo sp_typeid_< T >::ti_ = sp_typeid_< T >::name(); +#else +template<class T> sp_typeinfo sp_typeid_< T >::ti_(sp_typeid_< T >::name()); +#endif template<class T> struct sp_typeid_< T & >: sp_typeid_< T > { diff --git a/3rdParty/Boost/src/boost/detail/workaround.hpp b/3rdParty/Boost/src/boost/detail/workaround.hpp index b6b6412..40b3423 100644 --- a/3rdParty/Boost/src/boost/detail/workaround.hpp +++ b/3rdParty/Boost/src/boost/detail/workaround.hpp @@ -65,6 +65,11 @@ #else #define BOOST_MSVC_WORKAROUND_GUARD 0 #endif +#ifndef BOOST_MSVC_FULL_VER +#define BOOST_MSVC_FULL_VER_WORKAROUND_GUARD 1 +#else +#define BOOST_MSVC_FULL_VER_WORKAROUND_GUARD 0 +#endif #ifndef __GNUC__ #define __GNUC___WORKAROUND_GUARD 1 #else |