Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-24 20:33:19 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-24 20:35:17 (GMT) |
| commit | 332d60c56dfaa11fdd135088279d15cd5983b3d4 (patch) | |
| tree | dd77717a4e1732da929d5ff8a0471fa3f005e201 /3rdParty/Boost/src/boost/uuid/uuid.hpp | |
| parent | 90c44a10fec26d2a0935b2d62e82b6a5be028373 (diff) | |
| download | swift-332d60c56dfaa11fdd135088279d15cd5983b3d4.zip swift-332d60c56dfaa11fdd135088279d15cd5983b3d4.tar.bz2 | |
Upgraded Boost to 1.45.0.
Diffstat (limited to '3rdParty/Boost/src/boost/uuid/uuid.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/uuid/uuid.hpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/boost/uuid/uuid.hpp b/3rdParty/Boost/src/boost/uuid/uuid.hpp index ceebd4d..2678d85 100644 --- a/3rdParty/Boost/src/boost/uuid/uuid.hpp +++ b/3rdParty/Boost/src/boost/uuid/uuid.hpp @@ -37,8 +37,10 @@ #include <boost/cstdint.hpp> #include <algorithm> #include <boost/config.hpp> // for static assert -#include <boost/mpl/bool.hpp> +#ifndef BOOST_UUID_NO_TYPE_TRAITS #include <boost/type_traits/is_pod.hpp> +#include <boost/type_traits/integral_constant.hpp> +#endif #if defined(_MSC_VER) #pragma warning(push) // Save warning settings. @@ -202,14 +204,15 @@ inline std::size_t hash_value(uuid const& u) /* throw() */ }} //namespace boost::uuids +#ifndef BOOST_UUID_NO_TYPE_TRAITS // type traits specializations namespace boost { template <> -struct is_pod<uuids::uuid> : mpl::true_ -{}; +struct is_pod<uuids::uuid> : true_type {}; } // namespace boost +#endif #if defined(_MSC_VER) #pragma warning(pop) // Restore warnings to previous state. |