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

Subject: [Boost-commit] svn:boost r58309 - in trunk: boost/uuid libs/uuid/test
From: atompkins_at_[hidden]
Date: 2009-12-12 00:01:14

Author: atompkins
Date: 2009-12-12 00:01:13 EST (Sat, 12 Dec 2009)
New Revision: 58309
URL: http://svn.boost.org/trac/boost/changeset/58309

Log:
Fixed a few compile problems.
Text files modified: 
   trunk/boost/uuid/uuid_generators.hpp     |     6 +++---                                  
   trunk/libs/uuid/test/test_sha1.cpp       |     2 +-                                      
   trunk/libs/uuid/test/test_tagging.cpp    |     1 +                                       
   trunk/libs/uuid/test/test_uuid_class.cpp |     8 --------                                
   4 files changed, 5 insertions(+), 12 deletions(-)

Modified: trunk/boost/uuid/uuid_generators.hpp
==============================================================================
--- trunk/boost/uuid/uuid_generators.hpp	(original)
+++ trunk/boost/uuid/uuid_generators.hpp	2009-12-12 00:01:13 EST (Sat, 12 Dec 2009)
@@ -150,7 +150,7 @@
 
         char const* d = std::find(&digits[0], digits_end, c);
         if (d == digits_end) {
-            return -1;
+            return static_cast<unsigned char>(-1);
         }
 
         return values[std::distance(digits, d)];
@@ -164,7 +164,7 @@
 
         wchar_t const* d = std::find(digits, digits_end, c);
         if (d == digits_end) {
-            return -1;
+            return static_cast<unsigned char>(-1);
         }
 
         return values[std::distance(digits, d)];
@@ -263,7 +263,7 @@
     }
     
     template<>
-    void process_characters(char const*const characters, size_t count) {
+    void process_characters<char>(char const*const characters, size_t count) {
         sha.process_bytes(characters, count);
     }
 

Modified: trunk/libs/uuid/test/test_sha1.cpp
==============================================================================
--- trunk/libs/uuid/test/test_sha1.cpp	(original)
+++ trunk/libs/uuid/test/test_sha1.cpp	2009-12-12 00:01:13 EST (Sat, 12 Dec 2009)
@@ -23,7 +23,7 @@
 #ifdef BOOST_NO_STDC_NAMESPACE
 namespace std {
   using ::strlen;
-  using ::size_t
+  using ::size_t;
 } //namespace std
 #endif
 

Modified: trunk/libs/uuid/test/test_tagging.cpp
==============================================================================
--- trunk/libs/uuid/test/test_tagging.cpp	(original)
+++ trunk/libs/uuid/test/test_tagging.cpp	2009-12-12 00:01:13 EST (Sat, 12 Dec 2009)
@@ -40,6 +40,7 @@
     object& operator=(object const& rhs) {
         tag = rhs.tag;
         state = rhs.state;
+        return *this;
     }
     
     int get_state() const { return state; }

Modified: trunk/libs/uuid/test/test_uuid_class.cpp
==============================================================================
--- trunk/libs/uuid/test/test_uuid_class.cpp	(original)
+++ trunk/libs/uuid/test/test_uuid_class.cpp	2009-12-12 00:01:13 EST (Sat, 12 Dec 2009)
@@ -26,14 +26,6 @@
     explicit uuid_class(boost::uuids::uuid const& u)
         : boost::uuids::uuid(u)
     {}
-
-    operator boost::uuids::uuid() {
-        return static_cast<boost::uuids::uuid&>(*this);
-    }
-    
-    operator boost::uuids::uuid() const {
-        return static_cast<boost::uuids::uuid const&>(*this);
-    }
 };
 
 int test_main(int, char*[])