9 files changed, 61 insertions, 25 deletions

diff --git a/src/archable.cpp b/src/archable.cpp
deleted file mode 100644
index 38fc31f..0000000
--- a/src/archable.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "archable.h"
-
-Bu::Archable::Archable()
-{
-}
-
-Bu::Archable::~Archable()
-{
-}
-
diff --git a/src/archival.cpp b/src/archival.cpp
new file mode 100644
index 0000000..79c28f1
--- /dev/null
+++ b/src/archival.cpp
@@ -0,0 +1,10 @@
+#include "archival.h"
+
+Bu::Archival::Archival()
+{
+}
+
+Bu::Archival::~Archival()
+{
+}
+
diff --git a/src/archable.h b/src/archival.h
index ed05a78..e2c803c 100644
--- a/src/archable.h
+++ b/src/archival.h
@@ -1,5 +1,5 @@
-#ifndef ARCHABLE_H
-#define ARCHABLE_H
+#ifndef ARCHIVAL_H
+#define ARCHIVAL_H
 
 namespace Bu
 {
@@ -7,19 +7,22 @@ namespace Bu
          * The base class for any class you want to archive.  Simply include this as
          * a base class, implement the purely virtual archive function and you've
          * got an easily archiveable class.
+         *
+         * Archival: "of or pertaining to archives or valuable records; contained
+         * in or comprising such archives or records."
          */
-        class Archable
+        class Archival
         {
         public:
                 /**
                  * Does nothing, here for completeness.
                  */
-                Archable();
+                Archival();
 
                 /**
                  * Here to ensure the deconstructor is virtual.
                  */
-                virtual ~Archable();
+                virtual ~Archival();
 
                 /**
                  * This is the main workhorse of the archive system, just override and
diff --git a/src/archive.cpp b/src/archive.cpp
index be06c0e..edc8625 100644
--- a/src/archive.cpp
+++ b/src/archive.cpp
@@ -312,20 +312,20 @@ Bu::Archive &Bu::Archive::operator&&(long double &p)
 }
 
 
-Bu::Archive &Bu::operator<<(Bu::Archive &s, Bu::Archable &p)
+Bu::Archive &Bu::operator<<(Bu::Archive &s, Bu::Archival &p)
 {
         p.archive( s );
         return s;
 }
 
-Bu::Archive &Bu::operator>>(Bu::Archive &s, Bu::Archable &p)
+Bu::Archive &Bu::operator>>(Bu::Archive &s, Bu::Archival &p)
 {
         p.archive( s );
         return s;
 }
 
 /*
-Bu::Archive &Bu::operator&&(Bu::Archive &s, Bu::Archable &p)
+Bu::Archive &Bu::operator&&(Bu::Archive &s, Bu::Archival &p)
 {
         if (s.isLoading())
         {
diff --git a/src/archive.h b/src/archive.h
index 26e430b..a8ce53e 100644
--- a/src/archive.h
+++ b/src/archive.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 #include <string>
-#include "archable.h"
+#include "archival.h"
 #include "stream.h"
 
 namespace Bu
@@ -73,9 +73,9 @@ namespace Bu
                 Stream &rStream;
         };
 
-        Archive &operator<<(Archive &, class Bu::Archable &);
-        Archive &operator>>(Archive &, class Bu::Archable &);
-        //Archive &operator&&(Archive &s, class Bu::Archable &p);
+        Archive &operator<<(Archive &, class Bu::Archival &);
+        Archive &operator>>(Archive &, class Bu::Archival &);
+        //Archive &operator&&(Archive &s, class Bu::Archival &p);
 
         Archive &operator<<(Archive &, std::string &);
         Archive &operator>>(Archive &, std::string &);
diff --git a/src/fstring.h b/src/fstring.h
index 717068f..0184301 100644
--- a/src/fstring.h
+++ b/src/fstring.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 #include <memory>
-#include "archable.h"
+#include "archival.h"
 #include "archive.h"
 #include "hash.h"
 
@@ -29,7 +29,7 @@ namespace Bu
          * FBasicString into a ref-counting container class.
          */
         template< typename chr, typename chralloc=std::allocator<chr>, typename chunkalloc=std::allocator<struct FStringChunk<chr> > >
-        class FBasicString : public Archable
+        class FBasicString : public Archival
         {
 #ifndef VALTEST
 #define cpy( dest, src, size ) memcpy( dest, src, size*sizeof(chr) )
diff --git a/src/hash.h b/src/hash.h
index 9e498f1..dc097df 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -8,7 +8,7 @@
 #include <list>
 #include <utility>
 #include "exceptionbase.h"
-#include "archable.h"
+#include "archival.h"
 #include "archive.h"
 
 #define bitsToBytes( n ) (n/32+(n%32>0 ? 1 : 0))
diff --git a/src/ssocket.cpp b/src/ssocket.cpp
new file mode 100644
index 0000000..bdaac24
--- /dev/null
+++ b/src/ssocket.cpp
@@ -0,0 +1,9 @@
+#include "ssocket.h"
+
+SSocket::SSocket()
+{
+}
+
+SSocket::~SSocket()
+{
+}
diff --git a/src/ssocket.h b/src/ssocket.h
new file mode 100644
index 0000000..ce02091
--- /dev/null
+++ b/src/ssocket.h
@@ -0,0 +1,24 @@
+#ifndef S_SOCKET_H
+#define S_SOCKET_H
+
+#include <stdint.h>
+
+#include "stream.h"
+
+namespace Bu
+{
+        /**
+         *
+         */
+        class SSocket : public Stream
+        {
+        public:
+                SSocket();
+                virtual ~SSocket();
+
+        private:
+
+        };
+}
+
+#endif