6 files changed, 15 insertions, 15 deletions

diff --git a/src/unstable/archivestream.cpp b/src/unstable/archivestream.cpp
index 437c183..90a9599 100644
--- a/src/unstable/archivestream.cpp
+++ b/src/unstable/archivestream.cpp
@@ -7,7 +7,7 @@
 
 #include "bu/archivestream.h"
 
-Bu::ArchiveStream::ArchiveStream( Bu::ArchiveBase &ar ) :
+Bu::ArchiveStream::ArchiveStream( Bu::Archive &ar ) :
     ar( ar ),
     iPos( 0 )
 {
diff --git a/src/unstable/archivestream.h b/src/unstable/archivestream.h
index c694037..da6c6b0 100644
--- a/src/unstable/archivestream.h
+++ b/src/unstable/archivestream.h
@@ -7,7 +7,7 @@
 #ifndef BU_ARCHIVE_STREAM_H
 #define BU_ARCHIVE_STREAM_H
 
-#include "bu/archivebase.h"
+#include "bu/archive.h"
 #include "bu/stream.h"
 
 namespace Bu
@@ -15,7 +15,7 @@ namespace Bu
     class ArchiveStream : public Stream
     {
     public:
-        ArchiveStream( Bu::ArchiveBase &ar );
+        ArchiveStream( Bu::Archive &ar );
         virtual ~ArchiveStream();
 
         virtual void close();
@@ -41,7 +41,7 @@ namespace Bu
         virtual Bu::String getLocation() const;
 
     private:
-        Bu::ArchiveBase &ar;
+        Bu::Archive &ar;
         size iPos;
     };
 }
diff --git a/src/unstable/cachebase.h b/src/unstable/cachebase.h
index 7a54465..f986a89 100644
--- a/src/unstable/cachebase.h
+++ b/src/unstable/cachebase.h
@@ -9,7 +9,7 @@
 #define BU_CACHE_BASE_H
 
 #include "bu/string.h"
-#include "bu/archive.h"
+#include "bu/archivebinary.h"
 #include "bu/hash.h"
 #include "bu/readwritemutex.h"
 #include "bu/mutexlocker.h"
@@ -659,7 +659,7 @@ namespace Bu
     template<typename obtype>
     void _cacheObjectSave( Bu::Stream &s, obtype *pObject )
     {
-        Bu::Archive ar( s, Bu::Archive::save );
+        Bu::ArchiveBinary ar( s, Bu::Archive::save );
         ar << *pObject;
     }
 
@@ -670,7 +670,7 @@ namespace Bu
         Bu::Stream &s
         )
     {
-        Bu::Archive ar( s, Bu::Archive::load );
+        Bu::ArchiveBinary ar( s, Bu::Archive::load );
         obtype *ret = initObject(new obtype());
         ar >> *ret;
         return ret;
diff --git a/src/unstable/myriadcache.h b/src/unstable/myriadcache.h
index 7bba93b..8a1f9db 100644
--- a/src/unstable/myriadcache.h
+++ b/src/unstable/myriadcache.h
@@ -29,7 +29,7 @@ namespace Bu
             {
                 Bu::ReadWriteMutex::ReadLocker l( rwStore );
                 Bu::MyriadStream ms = mStore.openStream( 1 );
-                Bu::Archive ar( ms, Bu::Archive::load );
+                Bu::ArchiveBinary ar( ms, Bu::ArchiveBinary::load );
                 uint8_t uVer;
                 ar >> uVer;
                 switch( uVer )
@@ -118,7 +118,7 @@ namespace Bu
                 return;
 
             Bu::MyriadStream ms = mStore.openStream( 1 );
-            Bu::Archive ar( ms, Bu::Archive::save );
+            Bu::ArchiveBinary ar( ms, Bu::ArchiveBinary::save );
             ar << (uint8_t)0 << hIndex;
             ar.close();
             ms.setSize( ms.tell() );
diff --git a/src/unstable/uuid.cpp b/src/unstable/uuid.cpp
index c5ff943..6642d75 100644
--- a/src/unstable/uuid.cpp
+++ b/src/unstable/uuid.cpp
@@ -170,13 +170,13 @@ template<> bool Bu::__cmpHashKeys<Bu::Uuid>( const Bu::Uuid &a, const Bu::Uuid &
     return a == b;
 }
 
-Bu::ArchiveBase &Bu::operator>>( Bu::ArchiveBase &ar, Bu::Uuid &u )
+Bu::Archive &Bu::operator>>( Bu::Archive &ar, Bu::Uuid &u )
 {
     ar.read( u.data, 16 );
     return ar;
 }
 
-Bu::ArchiveBase &Bu::operator<<( Bu::ArchiveBase &ar, const Bu::Uuid &u )
+Bu::Archive &Bu::operator<<( Bu::Archive &ar, const Bu::Uuid &u )
 {
     ar.write( u.data, 16 );
     return ar;
diff --git a/src/unstable/uuid.h b/src/unstable/uuid.h
index 07ec333..d61a928 100644
--- a/src/unstable/uuid.h
+++ b/src/unstable/uuid.h
@@ -15,8 +15,8 @@ namespace Bu
 {
     class Uuid
     {
-    friend Bu::ArchiveBase &operator>>( Bu::ArchiveBase &ar, Uuid &u );
-    friend Bu::ArchiveBase &operator<<( Bu::ArchiveBase &ar, const Uuid &u );
+    friend Bu::Archive &operator>>( Bu::Archive &ar, Uuid &u );
+    friend Bu::Archive &operator<<( Bu::Archive &ar, const Uuid &u );
     public:
         Uuid();
         Uuid( const Uuid &src );
@@ -65,8 +65,8 @@ namespace Bu
         const Uuid &a, const Uuid &b );
 
     class Formatter;
-    Bu::ArchiveBase &operator>>( Bu::ArchiveBase &ar, Uuid &u );
-    Bu::ArchiveBase &operator<<( Bu::ArchiveBase &ar, const Uuid &u );
+    Bu::Archive &operator>>( Bu::Archive &ar, Uuid &u );
+    Bu::Archive &operator<<( Bu::Archive &ar, const Uuid &u );
     Bu::Formatter &operator<<( Bu::Formatter &f, const Uuid &u );
 };