Update of /cvsroot/gcblue/gcb_wx/include/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15509
Modified Files:
tcNetworkInterface.h
Log Message:
+ added ifdef MSV for #pragma once instruction
+ newline at the end of function
+ removed comma at the end of enum
+ modified order of attribute declaration to match the order of initialization
Index: tcNetworkInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcNetworkInterface.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcNetworkInterface.h 6 Mar 2004 20:52:29 -0000 1.6
--- tcNetworkInterface.h 4 Apr 2004 20:56:36 -0000 1.7
***************
*** 23,27 ****
--- 23,29 ----
#define _NETWORKINTERFACE_H_
+ #if _MSC_VER > 1000
#pragma once
+ #endif
#include "wx/wx.h"
***************
*** 34,37 ****
--- 36,40 ----
#include "tcConnectionData.h"
#include "tcMessage.h"
+ #include "gctypes.h"
#define BEGIN_NAMESPACE(x) namespace x {
***************
*** 42,46 ****
class tcNetworkInterface : public wxEvtHandler
{
! friend tcConnectionData;
public:
enum
--- 45,49 ----
class tcNetworkInterface : public wxEvtHandler
{
! friend class tcConnectionData;
public:
enum
***************
*** 53,57 ****
MESSAGE_BUFFER_SIZE = 128,
UDP_EVENT_ID = -123,
! MAX_UDP_SIZE = 4096,
};
--- 56,60 ----
MESSAGE_BUFFER_SIZE = 128,
UDP_EVENT_ID = -123,
! MAX_UDP_SIZE = 4096
};
***************
*** 81,91 ****
NOT_CONNECTED,
IS_CONNECTING,
! IS_CONNECTED,
} connectState;
bool isServer; ///< true if this interface is acting as a server, false if client
UINT32 connectionStartTime;
wxIPV4address hostAddress;
- int connectionIndex; ///< counter used to assigned connection id
wxSocketClient *clientSock; ///< single socket that will be used in client mode
--- 84,94 ----
NOT_CONNECTED,
IS_CONNECTING,
! IS_CONNECTED
} connectState;
+ int connectionIndex; ///< counter used to assigned connection id
bool isServer; ///< true if this interface is acting as a server, false if client
UINT32 connectionStartTime;
wxIPV4address hostAddress;
wxSocketClient *clientSock; ///< single socket that will be used in client mode
***************
*** 125,127 ****
END_NAMESPACE
! #endif
\ No newline at end of file
--- 128,131 ----
END_NAMESPACE
! #endif
!
|
