[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi/libRTI RTI1516ambassadorFactory.cpp
From: |
certi-cvs |
Subject: |
[certi-cvs] certi/libRTI RTI1516ambassadorFactory.cpp |
Date: |
Wed, 02 Jun 2010 06:55:48 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 10/06/02 06:55:48
Modified files:
libRTI : RTI1516ambassadorFactory.cpp
Log message:
Merge patch from Petr.
Fix compilation error when RTIA_USE_TCP on Unix/Linux.
bug #30028 : RTI1516ambassadorFactory.cpp build error
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTI1516ambassadorFactory.cpp?cvsroot=certi&r1=1.2&r2=1.3
Patches:
Index: RTI1516ambassadorFactory.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/RTI1516ambassadorFactory.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RTI1516ambassadorFactory.cpp 31 May 2010 09:33:25 -0000 1.2
+++ RTI1516ambassadorFactory.cpp 2 Jun 2010 06:55:48 -0000 1.3
@@ -63,8 +63,8 @@
#if defined(RTIA_USE_TCP)
int port = p_ambassador->privateRefs->socketUn->listenUN();
if (port == -1) {
- D.Out( pdError, "Cannot listen to RTIA connection. Abort." );
- throw RTI::RTIinternalError( "Cannot listen to RTIA connection"
);
+ D1516.Out( pdError, "Cannot listen to RTIA connection. Abort."
);
+ throw rti1516::RTIinternalError(L"Cannot listen to RTIA
connection" );
}
#else
int pipeFd = p_ambassador->privateRefs->socketUn->socketpair();
@@ -194,11 +194,11 @@
#endif
#if defined(RTIA_USE_TCP)
- if (privateRefs->socketUn->acceptUN(10*1000) == -1) {
+ if (p_ambassador->privateRefs->socketUn->acceptUN(10*1000) == -1) {
#ifdef _WIN32
- TerminateProcess(privateRefs->handle_RTIA, 0);
+ TerminateProcess(p_ambassdor->privateRefs->handle_RTIA, 0);
#else
- kill( privateRefs->pid_RTIA, SIGINT );
+ kill(p_ambassador->privateRefs->pid_RTIA, SIGINT );
#endif
throw rti1516::RTIinternalError( wstringize() << "Cannot
connect to RTIA" );
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi/libRTI RTI1516ambassadorFactory.cpp,
certi-cvs <=