[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIG/Federate.cc RTIG/Federation.cc RTIG/...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi RTIG/Federate.cc RTIG/Federation.cc RTIG/... |
|
Date: |
Tue, 24 Nov 2009 21:44:49 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 09/11/24 21:44:48
Modified files:
RTIG : Federate.cc Federation.cc Federation.hh
libCERTI : LBTS.cc ObjectClass.cc Message.cc SocketMC.hh
SocketUN.hh LBTS.hh SocketTCP.cc SocketUDP.hh
SecureTCPSocket.hh tokens.ll SocketUN.cc
Socket.hh HandleManager.hh SocketMC.cc
Message.hh WinPerfClock.cc SocketTCP.hh
SocketUDP.cc
test/Billard : Billard.cc main.cc
RTIA : DeclarationManagement.cc main.cc
Communications.cc TimeManagement.hh
ObjectManagement.cc OwnershipManagement.cc
include/RTI : SpecificConfig.h
libRTI : RTIambPrivateRefs.cc RTIambassador.cc
RTIambPrivateRefs.hh
include : certi.hh RTI.hh
Log message:
Check-in clean-up patch from Mathias
patch #7000: Fewer win32 defines
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federate.cc?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.119&r2=3.120
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.hh?cvsroot=certi&r1=3.61&r2=3.62
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/LBTS.cc?cvsroot=certi&r1=3.15&r2=3.16
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&r1=3.75&r2=3.76
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.cc?cvsroot=certi&r1=3.64&r2=3.65
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketMC.hh?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUN.hh?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/LBTS.hh?cvsroot=certi&r1=3.9&r2=3.10
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.cc?cvsroot=certi&r1=3.30&r2=3.31
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUDP.hh?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SecureTCPSocket.hh?cvsroot=certi&r1=3.9&r2=3.10
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/tokens.ll?cvsroot=certi&r1=3.6&r2=3.7
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUN.cc?cvsroot=certi&r1=3.33&r2=3.34
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Socket.hh?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/HandleManager.hh?cvsroot=certi&r1=3.7&r2=3.8
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketMC.cc?cvsroot=certi&r1=3.18&r2=3.19
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.hh?cvsroot=certi&r1=3.56&r2=3.57
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/WinPerfClock.cc?cvsroot=certi&r1=4.1&r2=4.2
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.hh?cvsroot=certi&r1=3.23&r2=3.24
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUDP.cc?cvsroot=certi&r1=3.26&r2=3.27
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/Billard.cc?cvsroot=certi&r1=3.42&r2=3.43
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/main.cc?cvsroot=certi&r1=3.25&r2=3.26
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DeclarationManagement.cc?cvsroot=certi&r1=3.28&r2=3.29
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/main.cc?cvsroot=certi&r1=3.26&r2=3.27
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Communications.cc?cvsroot=certi&r1=3.35&r2=3.36
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.hh?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.62&r2=3.63
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/OwnershipManagement.cc?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTI/SpecificConfig.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambPrivateRefs.cc?cvsroot=certi&r1=3.22&r2=3.23
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.110&r2=3.111
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambPrivateRefs.hh?cvsroot=certi&r1=3.9&r2=3.10
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.40&r2=3.41
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTI.hh?cvsroot=certi&r1=3.16&r2=3.17
Patches:
Index: RTIG/Federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federate.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- RTIG/Federate.cc 19 Nov 2009 18:15:29 -0000 3.17
+++ RTIG/Federate.cc 24 Nov 2009 21:44:47 -0000 3.18
@@ -16,7 +16,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: Federate.cc,v 3.17 2009/11/19 18:15:29 erk Exp $
+// $Id: Federate.cc,v 3.18 2009/11/24 21:44:47 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -24,18 +24,10 @@
#include "PrettyDebug.hh"
#include <algorithm>
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <cstring>
#include <string>
-#endif
static PrettyDebug G("GENDOC",__FILE__);
-using std::string ;
-
namespace certi {
namespace rtig {
@@ -92,4 +84,4 @@
}}
-// $Id: Federate.cc,v 3.17 2009/11/19 18:15:29 erk Exp $
+// $Id: Federate.cc,v 3.18 2009/11/24 21:44:47 erk Exp $
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.119
retrieving revision 3.120
diff -u -b -r3.119 -r3.120
--- RTIG/Federation.cc 24 Nov 2009 18:54:51 -0000 3.119
+++ RTIG/Federation.cc 24 Nov 2009 21:44:47 -0000 3.120
@@ -18,14 +18,18 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: Federation.cc,v 3.119 2009/11/24 18:54:51 erk Exp $
+// $Id: Federation.cc,v 3.120 2009/11/24 21:44:47 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
#include "Federation.hh"
#include "NM_Classes.hh"
#include <sstream>
+#include <cstring>
+#include <cerrno>
#include <memory>
+#include <sys/stat.h>
+#include <time.h>
#include "fed.hh"
#include "XmlParser.hh"
@@ -40,23 +44,6 @@
#include "LBTS.hh"
#include "NM_Classes.hh"
-#ifdef _WIN32
-#include <windows.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#else
-#include <map>
-#include <fstream>
-#include <iostream>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#endif
-
using std::pair ;
using std::ifstream ;
using std::ios ;
@@ -74,6 +61,10 @@
#define NODE_FEDERATE (const xmlChar*) "federate"
#endif // HAVE_XML
+#ifdef _WIN32
+# define strcasecmp stricmp
+#endif
+
namespace certi {
class XmlParser ;
@@ -2594,5 +2585,5 @@
}} // namespace certi/rtig
-// $Id: Federation.cc,v 3.119 2009/11/24 18:54:51 erk Exp $
+// $Id: Federation.cc,v 3.120 2009/11/24 21:44:47 erk Exp $
Index: RTIG/Federation.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.hh,v
retrieving revision 3.61
retrieving revision 3.62
diff -u -b -r3.61 -r3.62
--- RTIG/Federation.hh 24 Nov 2009 18:54:52 -0000 3.61
+++ RTIG/Federation.hh 24 Nov 2009 21:44:47 -0000 3.62
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: Federation.hh,v 3.61 2009/11/24 18:54:52 erk Exp $
+// $Id: Federation.hh,v 3.62 2009/11/24 21:44:47 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIG_FEDERATION_HH
@@ -32,11 +32,6 @@
#include "HandleManager.hh"
#include "certi.hh"
-#ifndef WIN32
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
#ifdef FEDERATION_USES_MULTICAST
#include "SocketMC.hh"
#endif
@@ -687,4 +682,4 @@
#endif // _CERTI_RTIG_FEDERATION_HH
-// $Id: Federation.hh,v 3.61 2009/11/24 18:54:52 erk Exp $
+// $Id: Federation.hh,v 3.62 2009/11/24 21:44:47 erk Exp $
Index: libCERTI/LBTS.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/LBTS.cc,v
retrieving revision 3.15
retrieving revision 3.16
diff -u -b -r3.15 -r3.16
--- libCERTI/LBTS.cc 21 Oct 2009 18:56:28 -0000 3.15
+++ libCERTI/LBTS.cc 24 Nov 2009 21:44:47 -0000 3.16
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: LBTS.cc,v 3.15 2009/10/21 18:56:28 erk Exp $
+// $Id: LBTS.cc,v 3.16 2009/11/24 21:44:47 erk Exp $
// ----------------------------------------------------------------------------
@@ -27,14 +27,6 @@
#include "LBTS.hh"
#include "Exception.hh"
#include "PrettyDebug.hh"
-
-#ifndef _WIN32
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <stdlib.h>
-#endif
-#include <float.h>
#include <limits>
using std::vector ;
@@ -160,4 +152,4 @@
} // namespace certi
-// $Id: LBTS.cc,v 3.15 2009/10/21 18:56:28 erk Exp $
+// $Id: LBTS.cc,v 3.16 2009/11/24 21:44:47 erk Exp $
Index: libCERTI/ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.75
retrieving revision 3.76
diff -u -b -r3.75 -r3.76
--- libCERTI/ObjectClass.cc 24 Nov 2009 16:39:20 -0000 3.75
+++ libCERTI/ObjectClass.cc 24 Nov 2009 21:44:47 -0000 3.76
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.cc,v 3.75 2009/11/24 16:39:20 erk Exp $
+// $Id: ObjectClass.cc,v 3.76 2009/11/24 21:44:47 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -38,12 +38,6 @@
#include <iostream>
#include <cassert>
-#ifdef _WIN32
-#ifdef max
-#undef max
-#endif
-#endif
-
using std::cout ;
using std::endl ;
@@ -1726,4 +1720,4 @@
} // namespace certi
-// $Id: ObjectClass.cc,v 3.75 2009/11/24 16:39:20 erk Exp $
+// $Id: ObjectClass.cc,v 3.76 2009/11/24 21:44:47 erk Exp $
Index: libCERTI/Message.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.cc,v
retrieving revision 3.64
retrieving revision 3.65
diff -u -b -r3.64 -r3.65
--- libCERTI/Message.cc 19 Nov 2009 18:15:31 -0000 3.64
+++ libCERTI/Message.cc 24 Nov 2009 21:44:47 -0000 3.65
@@ -394,7 +394,7 @@
// ----------------------------------------------------------------------------
void
-Message::setAttributes(std::vector <AttributeHandle> &the_attributes, ushort
the_size)
+Message::setAttributes(std::vector <AttributeHandle> &the_attributes, UShort
the_size)
{
handleArraySize = the_size ;
handleArray.resize(handleArraySize);
@@ -411,7 +411,7 @@
void
Message::setAttributes(std::vector <AttributeHandle> &the_attributes,
std::vector <AttributeValue_t> &the_values,
- ushort the_size)
+ UShort the_size)
{
G.Out(pdGendoc,"enter Message::setAttributes");
handleArraySize = the_size ;
@@ -432,7 +432,7 @@
void
Message::setParameters(std::vector <ParameterHandle> & the_parameters,
std::vector <ParameterValue_t> & the_values,
- ushort the_size)
+ UShort the_size)
{
handleArraySize = the_size ;
Index: libCERTI/SocketMC.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketMC.hh,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/SocketMC.hh 13 Oct 2008 11:27:51 -0000 3.13
+++ libCERTI/SocketMC.hh 24 Nov 2009 21:44:47 -0000 3.14
@@ -24,11 +24,6 @@
#include "NetworkMessage.hh"
#ifdef _WIN32
- #ifndef _WINSOCK2API_
- #ifndef _WINSOCKAPI_
- #include <winsock.h>
- #endif
- #endif
#if __MINGW32__
#define IP_ADD_MEMBERSHIP 5
struct ip_mreq {
@@ -36,10 +31,8 @@
struct in_addr imr_interface;
};
#endif
-#else
- #include <sys/socket.h>
- #include <netinet/in.h>
#endif
+
namespace certi {
class SocketMC : public Socket
@@ -59,11 +52,7 @@
virtual void receive(void *Buffer, unsigned long Size)
throw (NetworkError, NetworkSignal);
- #ifdef _WIN32
SOCKET returnSocket();
- #else
- virtual int returnSocket();
- #endif
virtual unsigned long returnAdress() const ;
virtual void close();
@@ -74,13 +63,12 @@
private:
struct sockaddr_in _sin ;
struct sockaddr_in _sin_e ;
- #ifdef _WIN32
+#ifdef _WIN32
int _sinlen;
- SOCKET _socket_emetteur;
- #else
+#else
socklen_t _sinlen;
- int _socket_emetteur;
- #endif
+#endif
+ SOCKET _socket_emetteur;
int _sinlen_e ;
int timeoutMC(int, int);
Index: libCERTI/SocketUN.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUN.hh,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- libCERTI/SocketUN.hh 21 Oct 2009 18:56:28 -0000 3.19
+++ libCERTI/SocketUN.hh 24 Nov 2009 21:44:47 -0000 3.20
@@ -21,11 +21,6 @@
#define CERTI_SOCKET_UN_HH
#include "SocketTCP.hh"
-#ifndef WIN32
- #include <netdb.h>
- #include <sys/socket.h>
-#endif
-
#include "Socket.hh"
#include "PrettyDebug.hh"
@@ -63,10 +58,6 @@
SocketUN(SignalHandlerType theType = stSignalInterrupt);
~SocketUN();
-#ifndef _WIN32
- typedef int SOCKET;
-#endif
-
int listenUN();
int connectUN(int port);
int acceptUN(unsigned msec);
Index: libCERTI/LBTS.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/LBTS.hh,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- libCERTI/LBTS.hh 2 Apr 2009 19:58:08 -0000 3.9
+++ libCERTI/LBTS.hh 24 Nov 2009 21:44:47 -0000 3.10
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: LBTS.hh,v 3.9 2009/04/02 19:58:08 erk Exp $
+// $Id: LBTS.hh,v 3.10 2009/11/24 21:44:47 erk Exp $
// ----------------------------------------------------------------------------
#ifndef LIBCERTI_LBTS_HH
@@ -28,11 +28,6 @@
#include "certi.hh"
#include "FedTimeD.hh"
-#ifndef _WIN32
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
#include <map>
#include <vector>
@@ -69,4 +64,4 @@
#endif // LIBCERTI_LBTS_HH
-// $Id: LBTS.hh,v 3.9 2009/04/02 19:58:08 erk Exp $
+// $Id: LBTS.hh,v 3.10 2009/11/24 21:44:47 erk Exp $
Index: libCERTI/SocketTCP.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.cc,v
retrieving revision 3.30
retrieving revision 3.31
diff -u -b -r3.30 -r3.31
--- libCERTI/SocketTCP.cc 21 Oct 2009 18:56:28 -0000 3.30
+++ libCERTI/SocketTCP.cc 24 Nov 2009 21:44:47 -0000 3.31
@@ -17,18 +17,9 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: SocketTCP.cc,v 3.30 2009/10/21 18:56:28 erk Exp $
+// $Id: SocketTCP.cc,v 3.31 2009/11/24 21:44:47 erk Exp $
// ----------------------------------------------------------------------------
-#ifdef _WIN32
- #define EADDRINUSE WSAEADDRINUSE
- #include <winsock2.h>
-#else
- #include <netdb.h>
- #include <unistd.h>
- #include <netinet/tcp.h>
-#endif
-
#include "SocketTCP.hh"
#include "PrettyDebug.hh"
@@ -546,11 +537,7 @@
}
// ----------------------------------------------------------------------------
-#ifdef _WIN32
SOCKET SocketTCP::returnSocket() { return _socket_tcp ;}
-#else
-int SocketTCP::returnSocket() { return _socket_tcp ;}
-#endif
// ----------------------------------------------------------------------------
//! Change the port value.
@@ -599,4 +586,4 @@
} // namespace
-// $Id: SocketTCP.cc,v 3.30 2009/10/21 18:56:28 erk Exp $
+// $Id: SocketTCP.cc,v 3.31 2009/11/24 21:44:47 erk Exp $
Index: libCERTI/SocketUDP.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUDP.hh,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/SocketUDP.hh 13 Oct 2008 11:27:51 -0000 3.13
+++ libCERTI/SocketUDP.hh 24 Nov 2009 21:44:47 -0000 3.14
@@ -22,17 +22,6 @@
#include "Socket.hh"
-#ifdef _WIN32
- #ifndef _WINSOCK2API_
- #ifndef _WINSOCKAPI_
- #include <winsock2.h>
- #endif
- #endif
-#else
- #include <sys/socket.h>
- #include <netdb.h>
-#endif
-
#define BUFFER_MAXSIZE 2000
namespace certi {
@@ -52,11 +41,7 @@
virtual bool isDataReady() const ;
- #ifdef _WIN32
SOCKET returnSocket();
- #else
- int returnSocket();
- #endif
virtual unsigned long returnAdress() const ;
virtual void close();
@@ -82,11 +67,7 @@
bool PhysicalLink ; ///< tak indicating physical or logical link
- #ifdef _WIN32
SOCKET _socket_udp;
- #else
- long _socket_udp;
- #endif
struct sockaddr_in sock_local ;
struct sockaddr_in sock_source ;
Index: libCERTI/SecureTCPSocket.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SecureTCPSocket.hh,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- libCERTI/SecureTCPSocket.hh 13 Oct 2008 11:27:51 -0000 3.9
+++ libCERTI/SecureTCPSocket.hh 24 Nov 2009 21:44:47 -0000 3.10
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: SecureTCPSocket.hh,v 3.9 2008/10/13 11:27:51 gotthardp Exp $
+// $Id: SecureTCPSocket.hh,v 3.10 2009/11/24 21:44:47 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_SECURE_TCP_SOCKET_HH
@@ -27,11 +27,6 @@
#include "GSSAPIHandler.hh"
#include "certi.hh"
-#ifndef _WIN32
- #include <unistd.h>
- #include <pwd.h>
-#endif
-
namespace certi {
// ============================================================================
@@ -94,5 +89,5 @@
#endif // CERTI_SECURE_TCP_SOCKET_HH
-// $Id: SecureTCPSocket.hh,v 3.9 2008/10/13 11:27:51 gotthardp Exp $
+// $Id: SecureTCPSocket.hh,v 3.10 2009/11/24 21:44:47 erk Exp $
Index: libCERTI/tokens.ll
===================================================================
RCS file: /sources/certi/certi/libCERTI/tokens.ll,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -b -r3.6 -r3.7
--- libCERTI/tokens.ll 16 Oct 2009 22:02:37 -0000 3.6
+++ libCERTI/tokens.ll 24 Nov 2009 21:44:47 -0000 3.7
@@ -20,7 +20,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: tokens.ll,v 3.6 2009/10/16 22:02:37 erk Exp $
+// $Id: tokens.ll,v 3.7 2009/11/24 21:44:47 erk Exp $
// ----------------------------------------------------------------------------
#include "syntax.h"
@@ -32,7 +32,7 @@
#ifndef HAVE_UNISTD_H
#define YY_NO_UNISTD_H 1
#endif
-#ifdef WIN32
+#ifdef _WIN32
#define isatty(fid) 0
#endif
Index: libCERTI/SocketUN.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUN.cc,v
retrieving revision 3.33
retrieving revision 3.34
diff -u -b -r3.33 -r3.34
--- libCERTI/SocketUN.cc 19 Nov 2009 18:15:32 -0000 3.33
+++ libCERTI/SocketUN.cc 24 Nov 2009 21:44:47 -0000 3.34
@@ -28,16 +28,6 @@
#include <sstream>
#include <string>
-#ifdef WIN32
-# include <windows.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <sys/un.h>
-# include <sys/types.h>
-# include <sys/socket.h>
-#endif
-
#include <iostream>
#include <assert.h>
@@ -45,14 +35,14 @@
using std::cout ;
using std::endl ;
-#ifdef WIN32
+#ifdef _WIN32
extern "C" int socketpair_win32(SOCKET socks[2], int make_overlapped);
#endif
namespace certi {
static PrettyDebug G("GENDOC",__FILE__);
-#ifndef WIN32
+#ifndef _WIN32
static void closesocket(int fd)
{
close(fd);
@@ -310,11 +300,7 @@
}
// ----------------------------------------------------------------------------
-#ifdef _WIN32
SOCKET
-#else
-int
-#endif
SocketUN::returnSocket()
{
return _socket_un;
Index: libCERTI/Socket.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Socket.hh,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- libCERTI/Socket.hh 7 Dec 2008 20:16:15 -0000 3.16
+++ libCERTI/Socket.hh 24 Nov 2009 21:44:47 -0000 3.17
@@ -22,11 +22,19 @@
#include "certi.hh"
#include "Exception.hh"
-#ifndef _WIN32
- #include <sys/time.h>
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <netdb.h>
+#ifdef _WIN32
+# define NOMINMAX
+# include <winsock2.h>
+# include <Ws2tcpip.h>
+typedef u_long in_addr_t;
+typedef unsigned short in_port_t;
+#else
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <netinet/tcp.h>
+# include <netdb.h>
+typedef int SOCKET;
#endif
#include <string>
@@ -53,11 +61,7 @@
virtual unsigned long returnAdress() const = 0 ;
- #ifdef _WIN32
virtual SOCKET returnSocket() = 0;
- #else
- virtual int returnSocket() = 0;
- #endif
/**
* This function build a string which represents
Index: libCERTI/HandleManager.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/HandleManager.hh,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -b -r3.7 -r3.8
--- libCERTI/HandleManager.hh 23 Nov 2009 12:16:49 -0000 3.7
+++ libCERTI/HandleManager.hh 24 Nov 2009 21:44:47 -0000 3.8
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: HandleManager.hh,v 3.7 2009/11/23 12:16:49 erk Exp $
+// $Id: HandleManager.hh,v 3.8 2009/11/24 21:44:47 erk Exp $
// ----------------------------------------------------------------------------
#ifndef LIBCERTI_HANDLE_MANAGER
@@ -27,12 +27,6 @@
#include <limits>
-#ifdef _WIN32
-#ifdef max
-#undef max
-#endif
-#endif
-
namespace certi {
/**
Index: libCERTI/SocketMC.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketMC.cc,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -b -r3.18 -r3.19
--- libCERTI/SocketMC.cc 14 Sep 2009 21:21:31 -0000 3.18
+++ libCERTI/SocketMC.cc 24 Nov 2009 21:44:47 -0000 3.19
@@ -23,16 +23,15 @@
#include "config.h"
#ifdef _WIN32
- #include "SocketTCP.hh"
+# include "SocketTCP.hh"
#else
- #include <arpa/inet.h>
- #include <unistd.h>
- #include <errno.h>
- #include <sys/time.h>
+# include <arpa/inet.h>
#endif
+
#include <cassert>
#include <cstdlib>
#include <cstring>
+#include <cerrno>
namespace certi {
Index: libCERTI/Message.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.hh,v
retrieving revision 3.56
retrieving revision 3.57
diff -u -b -r3.56 -r3.57
--- libCERTI/Message.hh 19 Nov 2009 18:15:32 -0000 3.56
+++ libCERTI/Message.hh 24 Nov 2009 21:44:47 -0000 3.57
@@ -369,9 +369,9 @@
std::vector<std::pair<ParameterHandle, ParameterValue_t> > getPHVPS()
const ;
void setPHVPS(const std::vector<std::pair<ParameterHandle,
ParameterValue_t> > &);
- void setAttributes(std::vector <AttributeHandle> &, ushort);
- void setAttributes(std::vector <AttributeHandle> &, std::vector
<AttributeValue_t> &, ushort);
- void setParameters(std::vector <ParameterHandle> &, std::vector
<ParameterValue_t> &, ushort);
+ void setAttributes(std::vector <AttributeHandle> &, UShort);
+ void setAttributes(std::vector <AttributeHandle> &, std::vector
<AttributeValue_t> &, UShort);
+ void setParameters(std::vector <ParameterHandle> &, std::vector
<ParameterValue_t> &, UShort);
void setException(TypeException, const std::string& the_reason = "");
TypeException getExceptionType() const { return exception ; };
Index: libCERTI/WinPerfClock.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/WinPerfClock.cc,v
retrieving revision 4.1
retrieving revision 4.2
diff -u -b -r4.1 -r4.2
--- libCERTI/WinPerfClock.cc 10 Oct 2008 11:29:06 -0000 4.1
+++ libCERTI/WinPerfClock.cc 24 Nov 2009 21:44:47 -0000 4.2
@@ -1,8 +1,5 @@
#include "WinPerfClock.hh"
-#include <iostream>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <windows.h>
namespace certi {
@@ -11,7 +8,6 @@
LARGE_INTEGER freq;
if (QueryPerformanceFrequency(&freq))
{
- std::cout << "Perffreq = " << freq.QuadPart <<std::endl;
resolution = 1.0e9 / static_cast<double>(freq.QuadPart);
}
else resolution = 0.0 ;
Index: libCERTI/SocketTCP.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.hh,v
retrieving revision 3.23
retrieving revision 3.24
diff -u -b -r3.23 -r3.24
--- libCERTI/SocketTCP.hh 13 Oct 2008 11:27:51 -0000 3.23
+++ libCERTI/SocketTCP.hh 24 Nov 2009 21:44:47 -0000 3.24
@@ -20,13 +20,8 @@
#ifndef CERTI_SOCKET_TCP_HH
#define CERTI_SOCKET_TCP_HH
-#include "Socket.hh"
#include "certi.hh"
-
-#ifndef _WIN32
- #include <sys/socket.h>
- #include <netinet/in.h>
-#endif
+#include "Socket.hh"
// This is the read buffer of TCP sockets. It must be at least as long
// as the longest data ever received by a socket.
@@ -67,13 +62,12 @@
SocketTCP &operator=(SocketTCP &theSocket);
+ virtual SOCKET returnSocket();
+
#ifdef _WIN32
- SOCKET returnSocket();
static bool winsockStartup();
static void winsockShutdown();
static bool winsockInitialized() { return (winsockInits
> 0);}
- #else
- virtual int returnSocket() ;
#endif
protected:
@@ -91,11 +85,9 @@
in_port_t getPort() const ;
in_addr_t getAddr() const ;
- #ifdef _WIN32
SOCKET _socket_tcp;
+ #ifdef _WIN32
static int winsockInits;
- #else
- long _socket_tcp;
#endif
bool _est_init_tcp;
struct sockaddr_in _sockIn;
Index: libCERTI/SocketUDP.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUDP.cc,v
retrieving revision 3.26
retrieving revision 3.27
diff -u -b -r3.26 -r3.27
--- libCERTI/SocketUDP.cc 19 Nov 2009 18:15:31 -0000 3.26
+++ libCERTI/SocketUDP.cc 24 Nov 2009 21:44:47 -0000 3.27
@@ -31,11 +31,8 @@
#ifdef _WIN32
#include "SocketTCP.hh"
-#else
-#include <sstream>
-#include <unistd.h>
-#include <strings.h>
#endif
+
#include <iostream>
#include <assert.h>
#include <errno.h>
@@ -88,7 +85,6 @@
SocketUDP::createConnection(const char *server_name, unsigned int port)
throw (NetworkError)
{
-// unsigned long addr = 0 ;
struct sockaddr_in sock_temp ;
char localhost[4096] ;
std::stringstream msg;
@@ -118,11 +114,7 @@
throw NetworkError(msg.str());
}
-#ifdef _WIN32
memcpy((char*)&sock_local.sin_addr,(char *)hp_local->h_addr,
hp_local->h_length);
-#else
- bcopy((char*)hp_local->h_addr, (char *)
&sock_local.sin_addr,hp_local->h_length);
-#endif
// lors du BIND, le systeme alloue un port libre au socket _sock_udp
sock_local.sin_family = AF_INET;
Index: test/Billard/Billard.cc
===================================================================
RCS file: /sources/certi/certi/test/Billard/Billard.cc,v
retrieving revision 3.42
retrieving revision 3.43
diff -u -b -r3.42 -r3.43
--- test/Billard/Billard.cc 21 Oct 2009 20:04:46 -0000 3.42
+++ test/Billard/Billard.cc 24 Nov 2009 21:44:48 -0000 3.43
@@ -29,6 +29,12 @@
#include <unistd.h>
#endif
+#ifdef _WIN32
+#include <windows.h>
+#define sleep(a) Sleep(a * 1000)
+#define usleep(a) Sleep(a / 1000)
+#endif
+
#include <memory>
#include <iostream>
#include <cstdlib>
Index: test/Billard/main.cc
===================================================================
RCS file: /sources/certi/certi/test/Billard/main.cc,v
retrieving revision 3.25
retrieving revision 3.26
diff -u -b -r3.25 -r3.26
--- test/Billard/main.cc 21 Oct 2009 20:04:46 -0000 3.25
+++ test/Billard/main.cc 24 Nov 2009 21:44:48 -0000 3.26
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: main.cc,v 3.25 2009/10/21 20:04:46 erk Exp $
+// $Id: main.cc,v 3.26 2009/11/24 21:44:48 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -51,6 +51,12 @@
#include <unistd.h>
#endif
+#ifdef _WIN32
+#include <windows.h>
+#define sleep(a) Sleep(a * 1000)
+#define usleep(a) Sleep(a / 1000)
+#endif
+
using std::string ;
using std::cout ;
using std::endl ;
Index: RTIA/DeclarationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/DeclarationManagement.cc,v
retrieving revision 3.28
retrieving revision 3.29
diff -u -b -r3.28 -r3.29
--- RTIA/DeclarationManagement.cc 21 Oct 2009 18:56:28 -0000 3.28
+++ RTIA/DeclarationManagement.cc 24 Nov 2009 21:44:48 -0000 3.29
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: DeclarationManagement.cc,v 3.28 2009/10/21 18:56:28 erk Exp $
+// $Id: DeclarationManagement.cc,v 3.29 2009/11/24 21:44:48 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -28,15 +28,6 @@
#include "DeclarationManagement.hh"
#include "NM_Classes.hh"
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
#include <memory>
namespace certi {
@@ -499,4 +490,4 @@
}} // namespace certi/rtia
-// $Id: DeclarationManagement.cc,v 3.28 2009/10/21 18:56:28 erk Exp $
+// $Id: DeclarationManagement.cc,v 3.29 2009/11/24 21:44:48 erk Exp $
Index: RTIA/main.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/main.cc,v
retrieving revision 3.26
retrieving revision 3.27
diff -u -b -r3.26 -r3.27
--- RTIA/main.cc 14 Sep 2009 20:51:51 -0000 3.26
+++ RTIA/main.cc 24 Nov 2009 21:44:48 -0000 3.27
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: main.cc,v 3.26 2009/09/14 20:51:51 erk Exp $
+// $Id: main.cc,v 3.27 2009/11/24 21:44:48 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -63,12 +63,6 @@
set_new_handler(NewHandler);
normal_end = 0;
- if (NULL!=getenv("RTIA_DEBUG")) {
- cerr << "RTIA:: RTIA_DEBUG is set: Waiting <"<<
getenv("RTIA_DEBUG")
- << " seconds> before starting RTIA"<<endl;
- sleep(atoi(getenv("RTIA_DEBUG")));
- }
-
// Command line
gengetopt_args_info args ;
if (cmdline_parser(argc, argv, &args))
@@ -132,4 +126,4 @@
throw MemoryExhausted("RTIA has exhausted memory error");
}
-// EOF $Id: main.cc,v 3.26 2009/09/14 20:51:51 erk Exp $
+// EOF $Id: main.cc,v 3.27 2009/11/24 21:44:48 erk Exp $
Index: RTIA/Communications.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/Communications.cc,v
retrieving revision 3.35
retrieving revision 3.36
diff -u -b -r3.35 -r3.36
--- RTIA/Communications.cc 21 Oct 2009 18:56:28 -0000 3.35
+++ RTIA/Communications.cc 24 Nov 2009 21:44:48 -0000 3.36
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: Communications.cc,v 3.35 2009/10/21 18:56:28 erk Exp $
+// $Id: Communications.cc,v 3.36 2009/11/24 21:44:48 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -30,22 +30,11 @@
#include "SocketHTTPProxy.hh"
#include "SecureTCPSocket.hh"
-#ifdef _WIN32
- #include <windows.h>
- #ifdef max
- #undef max
- #endif
-#else
- #include <unistd.h>
- #include <errno.h>
-#endif
-
+#include <cerrno>
#include <fstream>
#include <iostream>
#include <cstdlib>
-
-
using std::ifstream ;
using std::ios ;
using std::cout ;
@@ -369,4 +358,4 @@
}} // namespace certi/rtia
-// $Id: Communications.cc,v 3.35 2009/10/21 18:56:28 erk Exp $
+// $Id: Communications.cc,v 3.36 2009/11/24 21:44:48 erk Exp $
Index: RTIA/TimeManagement.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.hh,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- RTIA/TimeManagement.hh 21 Oct 2009 18:56:28 -0000 3.21
+++ RTIA/TimeManagement.hh 24 Nov 2009 21:44:48 -0000 3.22
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: TimeManagement.hh,v 3.21 2009/10/21 18:56:28 erk Exp $
+// $Id: TimeManagement.hh,v 3.22 2009/11/24 21:44:48 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_RTIA_TIME_MANAGEMENT_HH
@@ -38,14 +38,6 @@
#include "PrettyDebug.hh"
// Standard libraries
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdlib.h>
-#endif
#include <iostream>
using std::cout ;
@@ -162,4 +154,4 @@
#endif // CERTI_RTIA_TIME_MANAGEMENT_HH
-// $Id: TimeManagement.hh,v 3.21 2009/10/21 18:56:28 erk Exp $
+// $Id: TimeManagement.hh,v 3.22 2009/11/24 21:44:48 erk Exp $
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.62
retrieving revision 3.63
diff -u -b -r3.62 -r3.63
--- RTIA/ObjectManagement.cc 19 Nov 2009 18:15:30 -0000 3.62
+++ RTIA/ObjectManagement.cc 24 Nov 2009 21:44:48 -0000 3.63
@@ -23,6 +23,7 @@
#include <config.h>
#include <cassert>
#include <memory>
+#include <iostream>
#include "InteractionSet.hh"
#include "ObjectSet.hh"
@@ -33,15 +34,6 @@
#include "TimeManagement.hh"
#include "NM_Classes.hh"
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <iostream>
-#endif
using std::cout ;
using std::endl ;
Index: RTIA/OwnershipManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/OwnershipManagement.cc,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- RTIA/OwnershipManagement.cc 19 Nov 2009 18:15:30 -0000 3.21
+++ RTIA/OwnershipManagement.cc 24 Nov 2009 21:44:48 -0000 3.22
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: OwnershipManagement.cc,v 3.21 2009/11/19 18:15:30 erk Exp $
+// $Id: OwnershipManagement.cc,v 3.22 2009/11/24 21:44:48 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -27,15 +27,6 @@
#include "PrettyDebug.hh"
#include "NM_Classes.hh"
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <cstdio>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <cstdlib>
-#endif
#include <memory>
namespace certi {
@@ -512,4 +503,4 @@
}} // namespace certi/rtia
-// $Id: OwnershipManagement.cc,v 3.21 2009/11/19 18:15:30 erk Exp $
+// $Id: OwnershipManagement.cc,v 3.22 2009/11/24 21:44:48 erk Exp $
Index: include/RTI/SpecificConfig.h
===================================================================
RCS file: /sources/certi/certi/include/RTI/SpecificConfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/RTI/SpecificConfig.h 7 Oct 2008 18:46:22 -0000 1.1
+++ include/RTI/SpecificConfig.h 24 Nov 2009 21:44:48 -0000 1.2
@@ -50,7 +50,7 @@
#endif // BUILDING_FEDTIME
#endif // STATIC_FEDTIME
-#else // !WIN32
+#else // !_WIN32
// no special qualfifers are necessary on non-WIN32 platforms
#define RTI_EXPORT
#define RTI_EXPORT_FEDTIME
Index: libRTI/RTIambPrivateRefs.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambPrivateRefs.cc,v
retrieving revision 3.22
retrieving revision 3.23
diff -u -b -r3.22 -r3.23
--- libRTI/RTIambPrivateRefs.cc 19 Nov 2009 18:15:32 -0000 3.22
+++ libRTI/RTIambPrivateRefs.cc 24 Nov 2009 21:44:48 -0000 3.23
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambPrivateRefs.cc,v 3.22 2009/11/19 18:15:32 erk Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.23 2009/11/24 21:44:48 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -37,7 +37,11 @@
RTIambPrivateRefs::RTIambPrivateRefs()
{
fed_amb = NULL;
+#ifdef _WIN32
+ handle_RTIA = (HANDLE)-1;
+#else
pid_RTIA = (pid_t)-1;
+#endif
is_reentrant = false;
_theRootObj = NULL;
socketUn = NULL;
@@ -913,4 +917,4 @@
}
}
-// $Id: RTIambPrivateRefs.cc,v 3.22 2009/11/19 18:15:32 erk Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.23 2009/11/24 21:44:48 erk Exp $
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.110
retrieving revision 3.111
diff -u -b -r3.110 -r3.111
--- libRTI/RTIambassador.cc 19 Nov 2009 18:15:32 -0000 3.110
+++ libRTI/RTIambassador.cc 24 Nov 2009 21:44:48 -0000 3.111
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.110 2009/11/19 18:15:32 erk Exp $
+// $Id: RTIambassador.cc,v 3.111 2009/11/24 21:44:48 erk Exp $
// ----------------------------------------------------------------------------
#include "RTI.hh"
@@ -207,7 +207,6 @@
}
privateRefs->handle_RTIA = pi.hProcess;
- privateRefs->pid_RTIA = pi.dwProcessId;
#if !defined(RTIA_USE_TCP)
closesocket(pipeFd);
@@ -274,8 +273,8 @@
#if defined(RTIA_USE_TCP)
if (privateRefs->socketUn->acceptUN(10*1000) == -1) {
-#ifdef WIN32
- TerminateProcess(privateRefs->pid_RTIA, 0);
+#ifdef _WIN32
+ TerminateProcess(privateRefs->handle_RTIA, 0);
#else
kill( privateRefs->pid_RTIA, SIGINT );
#endif
@@ -3032,4 +3031,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.110 2009/11/19 18:15:32 erk Exp $
+// $Id: RTIambassador.cc,v 3.111 2009/11/24 21:44:48 erk Exp $
Index: libRTI/RTIambPrivateRefs.hh
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambPrivateRefs.hh,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- libRTI/RTIambPrivateRefs.hh 14 Sep 2009 20:51:51 -0000 3.9
+++ libRTI/RTIambPrivateRefs.hh 24 Nov 2009 21:44:48 -0000 3.10
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambPrivateRefs.hh,v 3.9 2009/09/14 20:51:51 erk Exp $
+// $Id: RTIambPrivateRefs.hh,v 3.10 2009/11/24 21:44:48 erk Exp $
// ----------------------------------------------------------------------------
#include "RTI.hh"
@@ -42,11 +42,11 @@
void callFederateAmbassador(Message *msg) throw (RTI::RTIinternalError);
void leave(const char *msg) throw (RTI::RTIinternalError);
- #ifdef _WIN32
+#ifdef _WIN32
HANDLE handle_RTIA;
- #endif
-
+#else
pid_t pid_RTIA ; //!< pid associated with rtia fork (private).
+#endif
//! Federate Ambassador reference for module calls.
RTI::FederateAmbassador *fed_amb ;
@@ -60,4 +60,4 @@
MessageBuffer msgBufSend,msgBufReceive ;
};
-// $Id: RTIambPrivateRefs.hh,v 3.9 2009/09/14 20:51:51 erk Exp $
+// $Id: RTIambPrivateRefs.hh,v 3.10 2009/11/24 21:44:48 erk Exp $
Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.40
retrieving revision 3.41
diff -u -b -r3.40 -r3.41
--- include/certi.hh 2 Apr 2009 19:58:11 -0000 3.40
+++ include/certi.hh 24 Nov 2009 21:44:48 -0000 3.41
@@ -16,31 +16,14 @@
// License along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: certi.hh,v 3.40 2009/04/02 19:58:11 erk Exp $
+// $Id: certi.hh,v 3.41 2009/11/24 21:44:48 erk Exp $
// ----------------------------------------------------------------------------
-#include <vector>
#ifndef CERTI_HH_INCLUDED
#define CERTI_HH_INCLUDED
#if defined(_WIN32)
- #include <windows.h>
- #include <algorithm>
- #include <process.h>
- #define sleep(a) Sleep(a * 1000)
- #define usleep(a) Sleep(a / 1000)
- typedef unsigned short ushort;
- typedef int pid_t;
- #define strcasecmp strcmp
#define STAT_FUNCTION _stat
#define STAT_STRUCT struct _stat
- /* TCP/IP related typedef and includes */
- #ifndef _WINSOCK2API_
- #ifndef _WINSOCKAPI_
- #include <winsock2.h>
- #endif
- #endif
- typedef u_long in_addr_t;
- typedef unsigned short in_port_t;
#ifdef _MSC_VER
typedef unsigned __int64 uint64_t;
typedef __int64 int64_t;
@@ -246,4 +229,4 @@
(uint64_t) CERTI_INT64_CONSTANT(0xff00000000000000U)) >> 56)))
#endif // CERTI_HH_INCLUDED
-// $Id: certi.hh,v 3.40 2009/04/02 19:58:11 erk Exp $
+// $Id: certi.hh,v 3.41 2009/11/24 21:44:48 erk Exp $
Index: include/RTI.hh
===================================================================
RCS file: /sources/certi/certi/include/RTI.hh,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- include/RTI.hh 2 Apr 2009 19:58:11 -0000 3.16
+++ include/RTI.hh 24 Nov 2009 21:44:48 -0000 3.17
@@ -1,11 +1,10 @@
// HLA 1.3 Header "RTI.hh"
-// $Id: RTI.hh,v 3.16 2009/04/02 19:58:11 erk Exp $
+// $Id: RTI.hh,v 3.17 2009/11/24 21:44:48 erk Exp $
#ifndef RTI_hh
#define RTI_hh
#if defined(_WIN32)
- #include <windows.h>
#pragma warning(disable: 4290)
#pragma warning(disable: 4275)
#pragma warning(disable: 4251)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi RTIG/Federate.cc RTIG/Federation.cc RTIG/...,
certi-cvs <=