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, 0 insertions, 64 deletions

diff --git a/src/serversocket.h b/src/serversocket.h
deleted file mode 100644
index ee357a4..0000000
--- a/src/serversocket.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
-
-#ifndef BU_SERVER_SOCKET_H
-#define BU_SERVER_SOCKET_H
-
-#include <stdint.h>
-#include "bu/fstring.h"
-#include "bu/exceptionbase.h"
-
-#ifdef WIN32
- #include <Winsock2.h>
-#else
- #include <sys/select.h>
-#endif
-
-namespace Bu
-{
-        subExceptionDecl( ServerSocketException );
-
-        /**
-         * A single tcp/ip server socket.  When created the server socket will bind
-         * to the specified interface and port, and immediately begin listening for
-         * connections.  When connections come in they are pooled by the networking
-         * drivers in the kernel until they are accepted, this means that failure
-         * to keep space in the connection pool will result in connection refusals.
-         *
-         * Although the accept function returns an integral file descriptor, it is
-         * designed to be used with the Socket class.
-         *
-         *@ingroup Serving
-         */
-        class ServerSocket
-        {
-        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();
-
-                int accept( int nTimeoutSec=0, int nTimeoutUSec=0 );
-                int getSocket();
-                int getPort();
-
-        private:
-                void startServer( struct sockaddr_in &name, int nPoolSize );
-                void initServer( struct sockaddr_in &name, int nPoolSize );
-
-                fd_set fdActive;
-#ifdef WIN32
-                unsigned int nServer;
-#else
-                int nServer;
-#endif
-                int nPort;
-        };
-}
-
-#endif