2 files changed, 19 insertions, 1 deletions

diff --git a/src/unstable/uuid.cpp b/src/unstable/uuid.cpp
index c76bb15..41a35c2 100644
--- a/src/unstable/uuid.cpp
+++ b/src/unstable/uuid.cpp
@@ -139,3 +139,15 @@ template<> bool Bu::__cmpHashKeys<Bu::Uuid>( const Bu::Uuid &a, const Bu::Uuid &
         return a == b;
 }
 
+Bu::ArchiveBase &Bu::operator>>( Bu::ArchiveBase &ar, Uuid &u )
+{
+        ar.read( u.data, 16 );
+        return ar;
+}
+
+Bu::ArchiveBase &Bu::operator<<( Bu::ArchiveBase &ar, const Uuid &u )
+{
+        ar.write( u.data, 16 );
+        return ar;
+}
+
diff --git a/src/unstable/uuid.h b/src/unstable/uuid.h
index db4c85b..73b34bc 100644
--- a/src/unstable/uuid.h
+++ b/src/unstable/uuid.h
@@ -14,6 +14,8 @@ namespace Bu
 {
         class Uuid
         {
+        friend Bu::ArchiveBase &operator>>( Bu::ArchiveBase &ar, Uuid &u );
+        friend Bu::ArchiveBase &operator<<( Bu::ArchiveBase &ar, const Uuid &u );
         public:
                 Uuid();
                 Uuid( const Uuid &src );
@@ -34,11 +36,12 @@ namespace Bu
                 static Uuid genV5();
 
                 void clear();
+                void set( const Bu::String &sSrc );
 
                 bool operator==( const Uuid &rhs ) const;
+                Uuid &operator=( const Bu::String &rhs ) { set( rhs ); return *this; }
 
         private:
-                void set( const Bu::String &sSrc );
                 unsigned char data[16];
         };
 
@@ -51,6 +54,9 @@ namespace Bu
         template<> uint32_t __calcHashCode<Uuid>( const Uuid &k );
         template<> bool __cmpHashKeys<Uuid>(
                 const Uuid &a, const Uuid &b );
+
+        Bu::ArchiveBase &operator>>( Bu::ArchiveBase &ar, Uuid &u );
+        Bu::ArchiveBase &operator<<( Bu::ArchiveBase &ar, const Uuid &u );
 };
 
 #endif