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.

4 files changed, 13 insertions, 13 deletions

diff --git a/src/tests/sharedcore.cpp b/src/tests/sharedcore.cpp
index 1d0c16e..9b0a0ec 100644
--- a/src/tests/sharedcore.cpp
+++ b/src/tests/sharedcore.cpp
@@ -14,7 +14,7 @@ struct ShintCore
 {
         int val;
 };
-class Shint : public Bu::SharedCore<struct ShintCore>
+class Shint : public Bu::SharedCore<Shint, struct ShintCore>
 {
 public:
         Shint()
diff --git a/src/tests/socketblock.cpp b/src/tests/socketblock.cpp
index a1ea18d..793ef96 100644
--- a/src/tests/socketblock.cpp
+++ b/src/tests/socketblock.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "bu/ito.h"
-#include "bu/socket.h"
-#include "bu/serversocket.h"
+#include "bu/tcpsocket.h"
+#include "bu/tcpserversocket.h"
 #include <stdio.h>
 #include <unistd.h>
 
@@ -21,7 +21,7 @@ public:
 
         virtual void run()
         {
-                Bu::Socket c = s.accept( 45, 0 );
+                Bu::TcpSocket c = s.accept( 45, 0 );
                 printf("TstServer:  Accetped connection.\n"); fflush( stdout );
                 
                 sleep( 1 );
@@ -35,7 +35,7 @@ public:
                 c.close();
         }
 
-        Bu::ServerSocket s;
+        Bu::TcpServerSocket s;
 };
 
 int main()
@@ -45,7 +45,7 @@ int main()
         ts.start();
 
         printf("main:  Connecting to server.\n"); fflush( stdout );
-        Bu::Socket s( "localhost", 55678 );
+        Bu::TcpSocket s( "localhost", 55678 );
 
         printf("main:  Sending 4 bytes.\n"); fflush( stdout );
         s.write( "aoeu", 4 );
diff --git a/src/tests/socketbreak.cpp b/src/tests/socketbreak.cpp
index 8339630..7d3c71a 100644
--- a/src/tests/socketbreak.cpp
+++ b/src/tests/socketbreak.cpp
@@ -5,17 +5,17 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#include "bu/serversocket.h"
-#include "bu/socket.h"
+#include "bu/tcpserversocket.h"
+#include "bu/tcpsocket.h"
 #include <unistd.h>
 
 int main()
 {
-        Bu::ServerSocket sSrv( 9987 );
+        Bu::TcpServerSocket sSrv( 9987 );
 
-        Bu::Socket sSend("localhost", 9987 );
+        Bu::TcpSocket sSend("localhost", 9987 );
 
-        Bu::Socket sRecv( sSrv.accept() );
+        Bu::TcpSocket sRecv( sSrv.accept() );
 
         printf("Connected sockets.\n");
 
diff --git a/src/tests/socket.cpp b/src/tests/tcpsocket.cpp
index ba4e9b9..30dd22f 100644
--- a/src/tests/socket.cpp
+++ b/src/tests/tcpsocket.cpp
@@ -5,7 +5,7 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#include <bu/socket.h>
+#include <bu/tcpsocket.h>
 #include <bu/sio.h>
 
 #include <sys/time.h>
@@ -17,7 +17,7 @@ bool isUp()
 {
         try
         {
-                Socket s("xagasoft.com", 9898, 1 );
+                TcpSocket s("xagasoft.com", 9898, 1 );
 
                 char buf[5];
                 buf[s.read(buf, 2, 1, 0)] = '\0';