comparison DEPENDENCIES/generic/include/boost/uuid/name_generator.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

 // TODO: add in common namesspace uuids
 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) {
         reset();
         process_characters(name, std::strlen(name));

     void process_characters(char_type const*const characters, size_t count) {
         BOOST_ASSERT(sizeof(uint32_t) >= sizeof(char_type));
 
         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));
         }
     }
     
     void process_characters(char const*const characters, size_t count) {
         sha.process_bytes(characters, count);

 
         sha.get_digest(digest);
 
         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
         // must be 0b10xxxxxx
         *(u.begin()+8) &= 0xBF;