Merged in the core branch. This is a major update that fixes many things, and

changes many others, including source files that were deleted and renamed.

Before doing this update, I reccomend a full clean, or even a fresh checkout.

Things to note, most outstanding about this update:
 - Bu::Socket was changed to Bu::TcpSocket and the default mode is blocking.
 - All templatized container classes are SharedCore now, which is good, but
   SharedCore is inherently non-reentrant safe.  However, all SharedCore classes
   have a "clone" function that return a non-shared copy of the object, safe for
   passing into a reentrant safe function accessing shared memory.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/itoserver.h b/src/itoserver.h
index c08d453..81e42cc 100644
--- a/src/itoserver.h
+++ b/src/itoserver.h
@@ -26,8 +26,8 @@
 
 namespace Bu
 {
-        class ServerSocket;
-        class Socket;
+        class TcpServerSocket;
+        class TcpSocket;
         class Client;
 
         /**
@@ -126,7 +126,7 @@ namespace Bu
                 int nTimeoutSec;
                 int nTimeoutUSec;
                 fd_set fdActive;
-                typedef Hash<int,ServerSocket *> ServerHash;
+                typedef Hash<int,TcpServerSocket *> ServerHash;
                 ServerHash hServers;
                 typedef Hash<int,ItoClient *> ClientHash;
                 typedef ItoQueue<ItoClient *> ClientQueue;