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, 5 insertions, 4 deletions

diff --git a/src/client.cpp b/src/client.cpp
index becd1bd..b635c8b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "bu/client.h"
-#include "bu/socket.h"
+#include "bu/tcpsocket.h"
 #include <stdlib.h>
 #include <errno.h>
 #include "bu/protocol.h"
@@ -16,7 +16,8 @@
 /** Read buffer size. */
 #define RBS             (1024*2)
 
-Bu::Client::Client( Bu::Socket *pSocket, class Bu::ClientLinkFactory *pfLink ) :
+Bu::Client::Client( Bu::TcpSocket *pSocket,
+                class Bu::ClientLinkFactory *pfLink ) :
         pTopStream( pSocket ),
         pSocket( pSocket ),
         pProto( NULL ),
@@ -59,7 +60,7 @@ void Bu::Client::processInput()
                                         break;
                         }
                 }
-                catch( Bu::SocketException &e )
+                catch( Bu::TcpSocketException &e )
                 {
                         pTopStream->close();
                         bWantsDisconnect = true;
@@ -195,7 +196,7 @@ long Bu::Client::getOutputSize()
         return qbWrite.getSize();
 }
 
-const Bu::Socket *Bu::Client::getSocket() const
+const Bu::TcpSocket *Bu::Client::getSocket() const
 {
         return pSocket;
 }