diff options
Diffstat (limited to '3rdParty/Boost/src/boost/uuid')
4 files changed, 9 insertions, 8 deletions
diff --git a/3rdParty/Boost/src/boost/uuid/name_generator.hpp b/3rdParty/Boost/src/boost/uuid/name_generator.hpp index 42473a6..fe582b4 100644 --- a/3rdParty/Boost/src/boost/uuid/name_generator.hpp +++ b/3rdParty/Boost/src/boost/uuid/name_generator.hpp @@ -71,10 +71,10 @@ private: for (size_t i=0; i<count; i++) { uint32_t c = characters[i]; - sha.process_byte( (c >> 0) && 0xFF ); - sha.process_byte( (c >> 8) && 0xFF ); - sha.process_byte( (c >> 16) && 0xFF ); - sha.process_byte( (c >> 24) && 0xFF ); + sha.process_byte( (c >> 0) & 0xFF ); + sha.process_byte( (c >> 8) & 0xFF ); + sha.process_byte( (c >> 16) & 0xFF ); + sha.process_byte( (c >> 24) & 0xFF ); } } diff --git a/3rdParty/Boost/src/boost/uuid/random_generator.hpp b/3rdParty/Boost/src/boost/uuid/random_generator.hpp index 4d11f6b..0f4a0ab 100644 --- a/3rdParty/Boost/src/boost/uuid/random_generator.hpp +++ b/3rdParty/Boost/src/boost/uuid/random_generator.hpp @@ -90,7 +90,8 @@ public: i = 0; } - *it = ((random_value >> (i*8)) & 0xFF); + // static_cast gets rid of warnings of converting unsigned long to boost::uint8_t + *it = static_cast<uuid::value_type>((random_value >> (i*8)) & 0xFF); } // set variant diff --git a/3rdParty/Boost/src/boost/uuid/seed_rng.hpp b/3rdParty/Boost/src/boost/uuid/seed_rng.hpp index 3090197..f59fdad 100644 --- a/3rdParty/Boost/src/boost/uuid/seed_rng.hpp +++ b/3rdParty/Boost/src/boost/uuid/seed_rng.hpp @@ -24,7 +24,6 @@ #include <boost/config.hpp> #include <cstring> // for memcpy #include <limits> -#include <memory.h> #include <ctime> // for time_t, time, clock_t, clock #include <cstdlib> // for rand #include <cstdio> // for FILE, fopen, fread, fclose diff --git a/3rdParty/Boost/src/boost/uuid/string_generator.hpp b/3rdParty/Boost/src/boost/uuid/string_generator.hpp index 7d2733b..538ebe8 100644 --- a/3rdParty/Boost/src/boost/uuid/string_generator.hpp +++ b/3rdParty/Boost/src/boost/uuid/string_generator.hpp @@ -14,6 +14,7 @@ #include <iterator> #include <algorithm> // for find #include <stdexcept> +#include <boost/throw_exception.hpp> #ifdef BOOST_NO_STDC_NAMESPACE namespace std { @@ -41,7 +42,7 @@ struct string_generator { template <typename ch, typename char_traits, typename alloc> uuid operator()(std::basic_string<ch, char_traits, alloc> const& s) const { return operator()(s.begin(), s.end()); - }; + } uuid operator()(char const*const s) const { return operator()(s, s+std::strlen(s)); @@ -174,7 +175,7 @@ private: } void throw_invalid() const { - throw std::runtime_error("invalid uuid string"); + BOOST_THROW_EXCEPTION(std::runtime_error("invalid uuid string")); } }; |