[crisscross commit] r857 - in trunk: . source source/crisscross

[codesite...@google.com]

Author: steven.noonan
Date: Tue Oct 14 21:33:32 2008
New Revision: 857

Modified:
trunk/CMakeLists.txt
trunk/source/crisscross/tcpsocket.h
trunk/source/crisscross/universal_include.h
trunk/source/tcpsocket.cpp

Log:

Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Tue Oct 14 21:33:32 2008
@@ -113,25 +113,25 @@
IF(MSVC)
IF(NOT WITH_SHARED_LIBS)
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
- SET(CMAKE_C_FLAGS "/nologo /W3 /GX /Gy /G6 /YX")
- SET(CMAKE_C_FLAGS_DEBUG "/MTd /Zi /Od")
+ SET(CMAKE_C_FLAGS "/nologo /W3 /GX /Gy /G6 /YX /Zi")
+ SET(CMAKE_C_FLAGS_DEBUG "/MTd /Od")
SET(CMAKE_C_FLAGS_RELEASE "/MT /O2")
SET(CMAKE_C_FLAGS_MINSIZEREL "/MT /O2")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/MTd /Zi /Od")
+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/MTd /Od")
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 7" OR CMAKE_GENERATOR
STREQUAL "Visual Studio 7 .NET 2003")
- SET(CMAKE_C_FLAGS "/nologo /W3 /Gy /Gm /G6 /GS-")
+ SET(CMAKE_C_FLAGS "/nologo /W3 /Gy /Gm /G6 /GS- /Zi")
SET(CMAKE_C_FLAGS_DEBUG "/MTd /Zi /Od")
SET(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ot")
SET(CMAKE_C_FLAGS_MINSIZEREL "/MT /O2 /Os")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/MTd /Od /Zi")
+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/MTd /Od")
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 7" OR CMAKE_GENERATOR
STREQUAL "Visual Studio 7 .NET 2003")
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR
STREQUAL "Visual Studio 9 2008")
- SET(CMAKE_C_FLAGS "/nologo /W3 /Gy /Gm /G6 /GS-")
- SET(CMAKE_C_FLAGS_DEBUG "/MTd /Zi /Od")
+ SET(CMAKE_C_FLAGS "/nologo /W3 /Gy /Gm /GS- /Zi")
+ SET(CMAKE_C_FLAGS_DEBUG "/MTd /Od")
SET(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ot")
SET(CMAKE_C_FLAGS_MINSIZEREL "/MT /O2 /Os")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/MTd /Od /Zi")
+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/MTd /Od")
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR
CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ENDIF(NOT WITH_SHARED_LIBS)
ENDIF(MSVC)
@@ -139,25 +139,25 @@
IF(MSVC)
IF(NOT WITH_SHARED_LIBS)
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
- SET(CMAKE_CXX_FLAGS "/nologo /W3 /GX /Gy /G6 /YX")
- SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Zi /Od")
+ SET(CMAKE_CXX_FLAGS "/nologo /W3 /GX /Gy /G6 /YX /Zi")
+ SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Od")
SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2")
SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Zi /Od")
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Od")
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 7" OR CMAKE_GENERATOR
STREQUAL "Visual Studio 7 .NET 2003")
- SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy /G6 /Gm /GS- /EHsc-")
- SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Zi /Od")
+ SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy /G6 /Gm /GS- /Zi /EHa")
+ SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Od")
SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ot")
SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2 /Os")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Od /Zi")
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Od")
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 7" OR CMAKE_GENERATOR
STREQUAL "Visual Studio 7 .NET 2003")
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR
STREQUAL "Visual Studio 9 2008")
- SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy /G6 /Gm /GS- /EHsc-")
- SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Zi /Od")
+ SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy /Gm /GS- /Zi /EHa")
+ SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Od")
SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ot")
SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2 /Os")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Od /Zi")
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Od")
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR
CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ENDIF(NOT WITH_SHARED_LIBS)
ENDIF(MSVC)

Modified: trunk/source/crisscross/tcpsocket.h
==============================================================================
--- trunk/source/crisscross/tcpsocket.h (original)
+++ trunk/source/crisscross/tcpsocket.h Tue Oct 14 21:33:32 2008
@@ -62,12 +62,6 @@
*/
CrissCross::Errors Listen(unsigned short _port);

- /*! \brief In asynchronous sockets, this verifies that no state
changes have occurred. */
- /*!
- * \sa State
- */
- void UpdateState();
-
/*! \brief Fetch the state of the socket. */
/*!
* \return The current state of m_sock.

Modified: trunk/source/crisscross/universal_include.h
==============================================================================
--- trunk/source/crisscross/universal_include.h (original)
+++ trunk/source/crisscross/universal_include.h Tue Oct 14 21:33:32 2008
@@ -56,7 +56,7 @@
#define ENABLE_CPUID
#define ENABLE_HASHES
#define ENABLE_SORTS
-#define ENABLE_CRASHREPORTS /* Enables XCrashReports on Windows. */
+//#define ENABLE_CRASHREPORTS /* Enables XCrashReports on Windows. */
/* #define DISABLE_DEPRECATED_CODE */ /* This will be enabled by default
in a future release */

/* Enables non-blocking sockets. */

Modified: trunk/source/tcpsocket.cpp
==============================================================================
--- trunk/source/tcpsocket.cpp (original)
+++ trunk/source/tcpsocket.cpp Tue Oct 14 21:33:32 2008
@@ -268,7 +268,7 @@
return CC_ERR_NONE;
}

- void TCPSocket::UpdateState()
+ socketState TCPSocket::State() const
{
/* Make sure there have been no spontaneous state changes. */
switch (m_state)
@@ -281,10 +281,6 @@
default:
break;
}
- }
-
- socketState TCPSocket::State() const
- {
return m_state;
}
}