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/uuid/name_generator.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-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/uuid/name_generator.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/uuid/name_generator.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/3rdParty/Boost/src/boost/uuid/name_generator.hpp b/3rdParty/Boost/src/boost/uuid/name_generator.hpp index fe582b4..2e5d8c1 100644 --- a/3rdParty/Boost/src/boost/uuid/name_generator.hpp +++ b/3rdParty/Boost/src/boost/uuid/name_generator.hpp @@ -30,8 +30,8 @@ class name_generator { public: typedef uuid result_type; - explicit name_generator(uuid const& namespace_uuid) - : namespace_uuid(namespace_uuid) + explicit name_generator(uuid const& namespace_uuid_) + : namespace_uuid(namespace_uuid_) {} uuid operator()(const char* name) { @@ -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(static_cast<unsigned char>((c >> 0) & 0xFF)); + sha.process_byte(static_cast<unsigned char>((c >> 8) & 0xFF)); + sha.process_byte(static_cast<unsigned char>((c >> 16) & 0xFF)); + sha.process_byte(static_cast<unsigned char>((c >> 24) & 0xFF)); } } @@ -96,10 +96,10 @@ private: uuid u; for (int i=0; i<4; ++i) { - *(u.begin() + i*4+0) = ((digest[i] >> 24) & 0xFF); - *(u.begin() + i*4+1) = ((digest[i] >> 16) & 0xFF); - *(u.begin() + i*4+2) = ((digest[i] >> 8) & 0xFF); - *(u.begin() + i*4+3) = ((digest[i] >> 0) & 0xFF); + *(u.begin() + i*4+0) = static_cast<uint8_t>((digest[i] >> 24) & 0xFF); + *(u.begin() + i*4+1) = static_cast<uint8_t>((digest[i] >> 16) & 0xFF); + *(u.begin() + i*4+2) = static_cast<uint8_t>((digest[i] >> 8) & 0xFF); + *(u.begin() + i*4+3) = static_cast<uint8_t>((digest[i] >> 0) & 0xFF); } // set variant |