boost/uuid
2
0
Fork 0
mirror of https://github.com/boostorg/uuid.git synced 2026-01-19 04:42:16 +00:00
Code Issues Projects Releases Wiki Activity

Attempt to fix GCC 5

Browse Source
This commit is contained in:
Peter Dimov
2025-12-25 13:04:47 +02:00
parent 09dd0dd608
commit 963bb373d0
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/boost/uuid/detail/endian.hpp
View File

@@ -104,7 +104,7 @@ BOOST_CXX14_CONSTEXPR inline std::uint64_t byteswap( std::uint64_t x ) noexcept
#if defined(__SIZEOF_INT128__)
inline __uint128_t byteswap( __uint128_t x ) noexcept
BOOST_CXX14_CONSTEXPR inline __uint128_t byteswap( __uint128_t x ) noexcept
{
return ( static_cast<__uint128_t>( detail::byteswap( static_cast<std::uint64_t>( x ) ) ) << 64 ) | detail::byteswap( static_cast<std::uint64_t>( x >> 64 ) );
}
@@ -220,9 +220,12 @@ BOOST_CXX14_CONSTEXPR inline std::uint32_t load_big_u32( unsigned char const* p
// load_*_u64
#if defined(BOOST_GCC) && BOOST_GCC >= 50000 && BOOST_GCC < 60000
BOOST_CXX14_CONSTEXPR
#endif
inline std::uint64_t load_native_u64( void const* p ) noexcept
{
std::uint64_t tmp;
std::uint64_t tmp = {};
std::memcpy( &tmp, p, sizeof( tmp ) );
return tmp;
}
@@ -277,9 +280,12 @@ BOOST_CXX14_CONSTEXPR inline std::uint64_t load_big_u64( unsigned char const* p
#if defined(__SIZEOF_INT128__)
#if defined(BOOST_GCC) && BOOST_GCC >= 50000 && BOOST_GCC < 60000
BOOST_CXX14_CONSTEXPR
#endif
inline __uint128_t load_native_u128( void const* p ) noexcept
{
__uint128_t tmp;
__uint128_t tmp = {};
std::memcpy( &tmp, p, sizeof( tmp ) );
return tmp;
}
@@ -300,9 +306,12 @@ inline __uint128_t load_little_u128( void const* p ) noexcept
#endif
}
#if defined(BOOST_GCC) && BOOST_GCC >= 50000 && BOOST_GCC < 60000
BOOST_CXX14_CONSTEXPR
#endif
inline __uint128_t load_big_u128( void const* p ) noexcept
{
__uint128_t tmp;
__uint128_t tmp = {};
std::memcpy( &tmp, p, sizeof( tmp ) );
#if BOOST_UUID_BYTE_ORDER == BOOST_UUID_ORDER_BIG_ENDIAN

2
include/boost/uuid/uuid.hpp
View File

@@ -371,7 +371,7 @@ template<> struct hash<boost::uuids::uuid>
} // namespace std
#if defined(BOOST_UUID_USE_SSE2)
#if defined(BOOST_UUID_USE_SSE2) && !( defined(BOOST_GCC) && BOOST_GCC >= 50000 && BOOST_GCC < 60000 )
# include <boost/uuid/detail/uuid_x86.ipp>
#elif defined(__SIZEOF_INT128__)
# include <boost/uuid/detail/uuid_uint128.ipp>