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, 9 insertions, 9 deletions

diff --git a/src/serversocket.h b/src/tcpserversocket.h
index ee357a4..b1d7e02 100644
--- a/src/serversocket.h
+++ b/src/tcpserversocket.h
@@ -5,8 +5,8 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#ifndef BU_SERVER_SOCKET_H
-#define BU_SERVER_SOCKET_H
+#ifndef BU_TCP_SERVER_SOCKET_H
+#define BU_TCP_SERVER_SOCKET_H
 
 #include <stdint.h>
 #include "bu/fstring.h"
@@ -20,7 +20,7 @@
 
 namespace Bu
 {
-        subExceptionDecl( ServerSocketException );
+        subExceptionDecl( TcpServerSocketException );
 
         /**
          * A single tcp/ip server socket.  When created the server socket will bind
@@ -34,14 +34,14 @@ namespace Bu
          *
          *@ingroup Serving
          */
-        class ServerSocket
+        class TcpServerSocket
         {
         public:
-                ServerSocket( int nPort, int nPoolSize=40 );
-                ServerSocket( const FString &sAddr, int nPort, int nPoolSize=40 );
-                ServerSocket( int nSocket, bool bInit, int nPoolSize=40 );
-                ServerSocket( const ServerSocket &rSrc );
-                virtual ~ServerSocket();
+                TcpServerSocket( int nPort, int nPoolSize=40 );
+                TcpServerSocket( const FString &sAddr, int nPort, int nPoolSize=40 );
+                TcpServerSocket( int nSocket, bool bInit, int nPoolSize=40 );
+                TcpServerSocket( const TcpServerSocket &rSrc );
+                virtual ~TcpServerSocket();
 
                 int accept( int nTimeoutSec=0, int nTimeoutUSec=0 );
                 int getSocket();