[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIA/RTIA_federate.cc RTIG/RTIG.cc includ...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi RTIA/RTIA_federate.cc RTIG/RTIG.cc includ... |
|
Date: |
Tue, 28 Oct 2008 12:07:27 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Petr Gotthard <gotthardp> 08/10/28 12:07:27
Modified files:
RTIA : RTIA_federate.cc
RTIG : RTIG.cc
include : certi.hh
libCERTI : Exception.cc Exception.hh Interaction.cc
Interaction.hh Message.cc Message.hh
libRTI : RTIambPrivateRefs.cc
Log message:
Bug #24516: Unified OrderType/OrderingHandle and
TransportType/TransportationHandle.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.90&r2=3.91
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.50&r2=3.51
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.35&r2=3.36
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Exception.cc?cvsroot=certi&r1=3.14&r2=3.15
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Exception.hh?cvsroot=certi&r1=3.6&r2=3.7
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.cc?cvsroot=certi&r1=3.43&r2=3.44
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.hh?cvsroot=certi&r1=3.29&r2=3.30
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.cc?cvsroot=certi&r1=3.60&r2=3.61
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.hh?cvsroot=certi&r1=3.51&r2=3.52
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambPrivateRefs.cc?cvsroot=certi&r1=3.13&r2=3.14
Patches:
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.90
retrieving revision 3.91
diff -u -b -r3.90 -r3.91
--- RTIA/RTIA_federate.cc 10 Oct 2008 15:18:22 -0000 3.90
+++ RTIA/RTIA_federate.cc 28 Oct 2008 12:07:25 -0000 3.91
@@ -515,7 +515,7 @@
om->changeAttributeTransportType(req->getObject(),
req->handleArray,
req->handleArraySize,
- req->getTransportType(),
+ req->getTransportation(),
e);
break ;
@@ -526,7 +526,7 @@
om->changeAttributeOrderType(req->getObject(),
req->handleArray,
req->handleArraySize,
- req->getOrderType(),
+ req->getOrdering(),
e);
break ;
@@ -535,7 +535,7 @@
"Receiving Message from Federate, type ChangeInterTransport.");
om->changeInteractionTransportType(req->getInteractionClass(),
- req->getTransportType(),
+ req->getTransportation(),
e);
break ;
@@ -544,7 +544,7 @@
"Receiving Message from Federate, type ChangeInterOrder.");
om->changeInteractionOrderType(req->getInteractionClass(),
- req->getOrderType(), e);
+ req->getOrdering(), e);
break ;
case Message::REQUEST_OBJECT_ATTRIBUTE_VALUE_UPDATE:
@@ -1356,9 +1356,9 @@
D.Out(pdExcept, "Catched %s Exception.", e._name);
rep.setException(e_InvalidObjectHandle);
}
- catch (InvalidOrderType &e) {
+ catch (InvalidOrderingHandle &e) {
D.Out(pdExcept, "Catched %s Exception.", e._name);
- rep.setException(e_InvalidOrderType);
+ rep.setException(e_InvalidOrderingHandle);
}
catch (InvalidResignAction &e) {
D.Out(pdExcept, "Catched %s Exception.", e._name);
@@ -1372,9 +1372,9 @@
D.Out(pdExcept, "Catched %s Exception.", e._name);
rep.setException(e_InvalidRoutingSpace);
}
- catch (InvalidTransportType &e) {
+ catch (InvalidTransportationHandle &e) {
D.Out(pdExcept, "Catched %s Exception.", e._name);
- rep.setException(e_InvalidTransportType);
+ rep.setException(e_InvalidTransportationHandle);
}
catch (MemoryExhausted &e) {
D.Out(pdExcept, "Catched %s Exception.", e._name);
Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.50
retrieving revision 3.51
diff -u -b -r3.50 -r3.51
--- RTIG/RTIG.cc 13 Oct 2008 10:06:48 -0000 3.50
+++ RTIG/RTIG.cc 28 Oct 2008 12:07:26 -0000 3.51
@@ -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: RTIG.cc,v 3.50 2008/10/13 10:06:48 erk Exp $
+// $Id: RTIG.cc,v 3.51 2008/10/28 12:07:26 gotthardp Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -807,10 +807,10 @@
CPY_NOT_NULL(e);
rep->exception = e_InvalidObjectHandle ;
}
- catch (InvalidOrderType &e) {
+ catch (InvalidOrderingHandle &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidOrderType ;
+ rep->exception = e_InvalidOrderingHandle ;
}
catch (InvalidResignAction &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
@@ -827,10 +827,10 @@
CPY_NOT_NULL(e);
rep->exception = e_InvalidRoutingSpace ;
}
- catch (InvalidTransportType &e) {
+ catch (InvalidTransportationHandle &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidTransportType ;
+ rep->exception = e_InvalidTransportationHandle ;
}
catch (MemoryExhausted &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
@@ -1025,4 +1025,4 @@
}} // namespace certi/rtig
-// $Id: RTIG.cc,v 3.50 2008/10/13 10:06:48 erk Exp $
+// $Id: RTIG.cc,v 3.51 2008/10/28 12:07:26 gotthardp Exp $
Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.35
retrieving revision 3.36
diff -u -b -r3.35 -r3.36
--- include/certi.hh 18 Sep 2008 17:19:27 -0000 3.35
+++ include/certi.hh 28 Oct 2008 12:07:26 -0000 3.36
@@ -16,7 +16,7 @@
// 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.35 2008/09/18 17:19:27 erk Exp $
+// $Id: certi.hh,v 3.36 2008/10/28 12:07:26 gotthardp Exp $
// ----------------------------------------------------------------------------
#include <vector>
@@ -200,8 +200,6 @@
RTI_EXCEPT(FederateNotPublishing)
RTI_EXCEPT(FederateNotSubscribing)
RTI_EXCEPT(InvalidObjectHandle)
-RTI_EXCEPT(InvalidOrderType)
-RTI_EXCEPT(InvalidTransportType)
RTI_EXCEPT(SecurityError)
RTI_EXCEPT(CouldNotOpenRID)
RTI_EXCEPT(ErrorReadingRID)
@@ -352,4 +350,4 @@
(uint64_t) CERTI_INT64_CONSTANT(0xff00000000000000U)) >> 56)))
#endif // CERTI_HH_INCLUDED
-// $Id: certi.hh,v 3.35 2008/09/18 17:19:27 erk Exp $
+// $Id: certi.hh,v 3.36 2008/10/28 12:07:26 gotthardp Exp $
Index: libCERTI/Exception.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Exception.cc,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -b -r3.14 -r3.15
--- libCERTI/Exception.cc 29 Sep 2008 12:31:28 -0000 3.14
+++ libCERTI/Exception.cc 28 Oct 2008 12:07:26 -0000 3.15
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Exception.cc,v 3.14 2008/09/29 12:31:28 erk Exp $
+// $Id: Exception.cc,v 3.15 2008/10/28 12:07:26 gotthardp Exp $
// ----------------------------------------------------------------------------
#include <assert.h>
@@ -115,8 +115,6 @@
const char *certi::FederateNotPublishing::_ex = "FederateNotPublishing" ;
const char *certi::FederateNotSubscribing::_ex = "FederateNotSubscribing" ;
const char *certi::InvalidObjectHandle::_ex = "InvalidObjectHandle" ;
-const char *certi::InvalidOrderType::_ex = "InvalidOrderType" ;
-const char *certi::InvalidTransportType::_ex = "InvalidTransportType" ;
const char *certi::SecurityError::_ex = "SecurityError" ;
const char *certi::CouldNotOpenRID::_ex = "CouldNotOpenRID" ;
const char *certi::ErrorReadingRID::_ex = "ErrorReadingRID" ;
@@ -224,8 +222,6 @@
long certi::FederateNotPublishing::type = certi::e_FederateNotPublishing ;
long certi::FederateNotSubscribing::type = certi::e_FederateNotSubscribing ;
long certi::InvalidObjectHandle::type = certi::e_InvalidObjectHandle ;
-long certi::InvalidOrderType::type = certi::e_InvalidOrderType ;
-long certi::InvalidTransportType::type = certi::e_InvalidTransportType ;
long certi::SecurityError::type = certi::e_SecurityError ;
long certi::CouldNotOpenRID::type = certi::e_CouldNotOpenRID ;
long certi::ErrorReadingRID::type = certi::e_ErrorReadingRID ;
Index: libCERTI/Exception.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Exception.hh,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -b -r3.6 -r3.7
--- libCERTI/Exception.hh 29 Apr 2008 07:50:23 -0000 3.6
+++ libCERTI/Exception.hh 28 Oct 2008 12:07:26 -0000 3.7
@@ -20,7 +20,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Exception.hh,v 3.6 2008/04/29 07:50:23 rousse Exp $
+// $Id: Exception.hh,v 3.7 2008/10/28 12:07:26 gotthardp Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_EXCEPTION_HH
@@ -83,11 +83,9 @@
e_InvalidFederationTime,
e_InvalidFederationTimeDelta,
e_InvalidObjectHandle,
- e_InvalidOrderType,
e_InvalidResignAction,
e_InvalidRetractionHandle,
e_InvalidRoutingSpace,
- e_InvalidTransportType,
e_MemoryExhausted,
e_NameNotFound,
e_NoPauseRequested,
@@ -144,4 +142,4 @@
#endif // _CERTI_EXCEPTION_HH
-// $Id: Exception.hh,v 3.6 2008/04/29 07:50:23 rousse Exp $
+// $Id: Exception.hh,v 3.7 2008/10/28 12:07:26 gotthardp Exp $
Index: libCERTI/Interaction.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.cc,v
retrieving revision 3.43
retrieving revision 3.44
diff -u -b -r3.43 -r3.44
--- libCERTI/Interaction.cc 18 Sep 2008 14:41:28 -0000 3.43
+++ libCERTI/Interaction.cc 28 Oct 2008 12:07:26 -0000 3.44
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Interaction.cc,v 3.43 2008/09/18 14:41:28 gotthardp Exp $
+// $Id: Interaction.cc,v 3.44 2008/10/28 12:07:26 gotthardp Exp $
// ----------------------------------------------------------------------------
@@ -142,14 +142,14 @@
Interaction::changeTransportationType(TransportType new_type,
FederateHandle the_handle)
throw (FederateNotPublishing,
- InvalidTransportType,
+ InvalidTransportationHandle,
RTIinternalError)
{
if (!isPublishing(the_handle))
throw FederateNotPublishing("Change Interaction Transport Type.");
if ((new_type != RELIABLE) && (new_type != BEST_EFFORT))
- throw InvalidTransportType("");
+ throw InvalidTransportationHandle("");
transport = new_type ;
@@ -162,14 +162,14 @@
void
Interaction::changeOrderType(OrderType new_order, FederateHandle the_handle)
throw (FederateNotPublishing,
- InvalidOrderType,
+ InvalidOrderingHandle,
RTIinternalError)
{
if (!isPublishing(the_handle))
throw FederateNotPublishing("Change Interaction Order Type.");
if ((new_order != RECEIVE) && (new_order != TIMESTAMP))
- throw InvalidOrderType("");
+ throw InvalidOrderingHandle("");
D.Out(pdInit, "Interaction %d: New Order type is %d.", handle, order);
}
@@ -532,4 +532,4 @@
} // namespace certi
-// $Id: Interaction.cc,v 3.43 2008/09/18 14:41:28 gotthardp Exp $
+// $Id: Interaction.cc,v 3.44 2008/10/28 12:07:26 gotthardp Exp $
Index: libCERTI/Interaction.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.hh,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -b -r3.29 -r3.30
--- libCERTI/Interaction.hh 18 Sep 2008 14:41:28 -0000 3.29
+++ libCERTI/Interaction.hh 28 Oct 2008 12:07:26 -0000 3.30
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Interaction.hh,v 3.29 2008/09/18 14:41:28 gotthardp Exp $
+// $Id: Interaction.hh,v 3.30 2008/10/28 12:07:26 gotthardp Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_INTERACTION_HH
@@ -89,10 +89,10 @@
// -- Transport and Ordering --
void changeTransportationType(TransportType new_type,
FederateHandle the_handle)
- throw (FederateNotPublishing, InvalidTransportType, RTIinternalError);
+ throw (FederateNotPublishing, InvalidTransportationHandle,
RTIinternalError);
void changeOrderType(OrderType new_order, FederateHandle the_handle)
- throw (FederateNotPublishing, InvalidOrderType, RTIinternalError);
+ throw (FederateNotPublishing, InvalidOrderingHandle, RTIinternalError);
// -- Instance Broadcasting --
void isReady(FederateHandle federate_handle,
@@ -167,4 +167,4 @@
#endif // _CERTI_INTERACTION.HH
-// $Id: Interaction.hh,v 3.29 2008/09/18 14:41:28 gotthardp Exp $
+// $Id: Interaction.hh,v 3.30 2008/10/28 12:07:26 gotthardp Exp $
Index: libCERTI/Message.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.cc,v
retrieving revision 3.60
retrieving revision 3.61
diff -u -b -r3.60 -r3.61
--- libCERTI/Message.cc 18 Sep 2008 14:41:28 -0000 3.60
+++ libCERTI/Message.cc 28 Oct 2008 12:07:26 -0000 3.61
@@ -241,14 +241,14 @@
void
Message::setTransportation(RTI::TransportationHandle the_transport)
{
- transport = ((the_transport == 1) ? RELIABLE : BEST_EFFORT);
+ transport = the_transport;
}
// ----------------------------------------------------------------------------
void
Message::setOrdering(RTI::OrderingHandle the_ordering)
{
- order = ((the_ordering == 1) ? RECEIVE : TIMESTAMP);
+ order = the_ordering;
}
// ----------------------------------------------------------------------------
Index: libCERTI/Message.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.hh,v
retrieving revision 3.51
retrieving revision 3.52
diff -u -b -r3.51 -r3.52
--- libCERTI/Message.hh 10 Oct 2008 15:18:22 -0000 3.51
+++ libCERTI/Message.hh 28 Oct 2008 12:07:26 -0000 3.52
@@ -341,16 +341,11 @@
void setTransportation(RTI::TransportationHandle);
RTI::TransportationHandle getTransportation() const
- { return ((transport == RELIABLE) ? 1 : 0); };
-
- TransportType getTransportType() const
- { return transport ; };
+ { return transport; }
void setOrdering(RTI::OrderingHandle);
RTI::OrderingHandle getOrdering() const
- { return ((order == RECEIVE) ? 1 : 0); };
-
- RTI::OrderType getOrderType() const { return order ; };
+ { return order; }
void setEventRetraction(EventRetractionHandle);
EventRetractionHandle getEventRetraction() const
Index: libRTI/RTIambPrivateRefs.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambPrivateRefs.cc,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libRTI/RTIambPrivateRefs.cc 29 May 2008 12:20:40 -0000 3.13
+++ libRTI/RTIambPrivateRefs.cc 28 Oct 2008 12:07:27 -0000 3.14
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambPrivateRefs.cc,v 3.13 2008/05/29 12:20:40 rousse Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.14 2008/10/28 12:07:27 gotthardp Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -375,9 +375,9 @@
throw InvalidObjectHandle(msg->getExceptionReason());
} break ;
- case e_InvalidOrderType: {
- D.Out(pdExcept, "Throwing e_InvalidOrderType exception.");
- throw InvalidOrderType(msg->getExceptionReason());
+ case e_InvalidOrderingHandle: {
+ D.Out(pdExcept, "Throwing e_InvalidOrderingHandle exception.");
+ throw InvalidOrderingHandle(msg->getExceptionReason());
} break ;
case e_InvalidResignAction: {
@@ -395,9 +395,9 @@
throw InvalidRoutingSpace(msg->getExceptionReason());
} break ;
- case e_InvalidTransportType: {
- D.Out(pdExcept, "Throwing e_InvalidTransportType exception.");
- throw InvalidTransportType(msg->getExceptionReason());
+ case e_InvalidTransportationHandle: {
+ D.Out(pdExcept, "Throwing e_InvalidTransportationHandle exception.");
+ throw InvalidTransportationHandle(msg->getExceptionReason());
} break ;
case e_MemoryExhausted: {
@@ -539,4 +539,4 @@
}
}
-// $Id: RTIambPrivateRefs.cc,v 3.13 2008/05/29 12:20:40 rousse Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.14 2008/10/28 12:07:27 gotthardp Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi RTIA/RTIA_federate.cc RTIG/RTIG.cc includ...,
certi-cvs <=