[Boost-commit] svn:boost r68866 - in trunk: boost/uuid libs/uuid/test

Subject: [Boost-commit] svn:boost r68866 - in trunk: boost/uuid libs/uuid/test
From: marshall_at_[hidden]
Date: 2011-02-14 12:34:40

Author: marshall
Date: 2011-02-14 12:34:35 EST (Mon, 14 Feb 2011)
New Revision: 68866
URL: http://svn.boost.org/trac/boost/changeset/68866

Log:
Fix bug in wide output; Refs #5145
Text files modified: 
   trunk/boost/uuid/name_generator.hpp          |     8 ++++----                                
   trunk/libs/uuid/test/test_name_generator.cpp |     2 +-                                      
   2 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/uuid/name_generator.hpp
==============================================================================
--- trunk/boost/uuid/name_generator.hpp	(original)
+++ trunk/boost/uuid/name_generator.hpp	2011-02-14 12:34:35 EST (Mon, 14 Feb 2011)
@@ -71,10 +71,10 @@
 
         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 );
         }
     }
     

Modified: trunk/libs/uuid/test/test_name_generator.cpp
==============================================================================
--- trunk/libs/uuid/test/test_name_generator.cpp	(original)
+++ trunk/libs/uuid/test/test_name_generator.cpp	2011-02-14 12:34:35 EST (Mon, 14 Feb 2011)
@@ -20,7 +20,7 @@
 
     uuid dns_namespace_uuid = {{0x6b, 0xa7, 0xb8, 0x10, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8}};
     uuid correct = {{0x21, 0xf7, 0xf8, 0xde, 0x80, 0x51, 0x5b, 0x89, 0x86, 0x80, 0x01, 0x95, 0xef, 0x79, 0x8b, 0x6a}};
-    uuid wcorrect = {{0xb9, 0x50, 0x66, 0x13, 0x2c, 0x04, 0x51, 0x2d, 0xb8, 0xfe, 0xbf, 0x8d, 0x0b, 0xa1, 0xb2, 0x71}};
+    uuid wcorrect = {{0xc3, 0x15, 0x27, 0x0b, 0xa4, 0x66, 0x58, 0x72, 0xac, 0xa4, 0x96, 0x26, 0xce, 0xc0, 0xf4, 0xbe}};
 
     name_generator gen(dns_namespace_uuid);