[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libRTI/ieee1516-2010/RTIambPrivateRefs.h ...
|
From: |
CERTI CVS commits |
|
Subject: |
[certi-cvs] certi libRTI/ieee1516-2010/RTIambPrivateRefs.h ... |
|
Date: |
Fri, 07 Mar 2014 18:00:52 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 14/03/07 18:00:51
Modified files:
libRTI/ieee1516-2010: RTIambPrivateRefs.h
RTIambassadorImplementation.cpp
RTIambPrivateRefs.cpp
HandleImplementation.h Handle.cpp
RTI1516fedTime.cpp RTI1516fedTime.h
RTIambassadorImplementation.h
RTIHandleFactory.h
RTIambassadorFactory.cpp CMakeLists.txt
HandleImplementation.cpp
libRTI : CMakeLists.txt
include/ieee1516-2010/RTI: RTIambassador.h
certiLogicalTimeInterval.h
certiLogicalTime.h SpecificConfig.h
certiLogicalTimeFactory.h
Log message:
Very alpha version of IEEE-1516-2010 library which compile just fine.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTIambPrivateRefs.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTIambassadorImplementation.cpp?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTIambPrivateRefs.cpp?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/HandleImplementation.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/Handle.cpp?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTI1516fedTime.cpp?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTI1516fedTime.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTIambassadorImplementation.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTIHandleFactory.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTIambassadorFactory.cpp?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/CMakeLists.txt?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/HandleImplementation.cpp?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/CMakeLists.txt?cvsroot=certi&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/certi/include/ieee1516-2010/RTI/RTIambassador.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/include/ieee1516-2010/RTI/certiLogicalTimeInterval.h?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/include/ieee1516-2010/RTI/certiLogicalTime.h?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/include/ieee1516-2010/RTI/SpecificConfig.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/include/ieee1516-2010/RTI/certiLogicalTimeFactory.h?cvsroot=certi&r1=1.2&r2=1.3
Patches:
Index: libRTI/ieee1516-2010/RTIambPrivateRefs.h
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/RTIambPrivateRefs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/ieee1516-2010/RTIambPrivateRefs.h 6 Mar 2014 16:11:31 -0000
1.1
+++ libRTI/ieee1516-2010/RTIambPrivateRefs.h 7 Mar 2014 18:00:49 -0000
1.2
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambPrivateRefs.h,v 1.1 2014/03/06 16:11:31 erk Exp $
+// $Id: RTIambPrivateRefs.h,v 1.2 2014/03/07 18:00:49 erk Exp $
// ----------------------------------------------------------------------------
#include <RTI/certiRTI1516.h>
@@ -38,8 +38,8 @@
void processException(Message *);
void executeService(Message *requete, Message *reponse);
void sendTickRequestStop();
- void callFederateAmbassador(Message *msg) throw
(rti1516::RTIinternalError);
- void leave(const char *msg) throw (rti1516::RTIinternalError);
+ void callFederateAmbassador(Message *msg) throw
(rti1516e::RTIinternalError);
+ void leave(const char *msg) throw (rti1516e::RTIinternalError);
#ifdef _WIN32
HANDLE handle_RTIA;
@@ -48,7 +48,7 @@
#endif
//! Federate Ambassador reference for module calls.
- rti1516::FederateAmbassador *fed_amb ;
+ rti1516e::FederateAmbassador *fed_amb ;
//! used to prevent reentrant calls (see tick() and executeService()).
bool is_reentrant ;
@@ -59,4 +59,4 @@
MessageBuffer msgBufSend,msgBufReceive ;
};
-// $Id: RTIambPrivateRefs.h,v 1.1 2014/03/06 16:11:31 erk Exp $
+// $Id: RTIambPrivateRefs.h,v 1.2 2014/03/07 18:00:49 erk Exp $
Index: libRTI/ieee1516-2010/RTIambassadorImplementation.cpp
===================================================================
RCS file:
/sources/certi/certi/libRTI/ieee1516-2010/RTIambassadorImplementation.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/ieee1516-2010/RTIambassadorImplementation.cpp 6 Mar 2014
16:11:31 -0000 1.1
+++ libRTI/ieee1516-2010/RTIambassadorImplementation.cpp 7 Mar 2014
18:00:49 -0000 1.2
@@ -146,6 +146,7 @@
*/
bool RTI1516ambassador::__tick_kernel(bool multiple, TickTime minimum,
TickTime maximum)
throw (rti1516e::SpecifiedSaveLabelDoesNotExist,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Tick_Request vers_RTI;
@@ -216,7 +217,31 @@
return false;
}
-// 4.2
+void RTI1516ambassador::connect (
+ rti1516e::FederateAmbassador & federateAmbassador,
+ rti1516e::CallbackModel theCallbackModel,
+ std::wstring const & localSettingsDesignator)
+throw (
+ rti1516e::ConnectionFailed,
+ rti1516e::InvalidLocalSettingsDesignator,
+ rti1516e::UnsupportedCallbackModel,
+ rti1516e::AlreadyConnected,
+ rti1516e::CallNotAllowedFromWithinCallback,
+ rti1516e::RTIinternalError)
+ {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+ }
+
+// 4.3
+void RTI1516ambassador::disconnect ()
+throw (
+ rti1516e::FederateIsExecutionMember,
+ rti1516e::CallNotAllowedFromWithinCallback,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 4.5
void RTI1516ambassador::createFederationExecution
(std::wstring const & federationExecutionName,
std::wstring const & fullPathNameToTheFDDfile,
@@ -225,6 +250,7 @@
rti1516e::CouldNotOpenFDD,
rti1516e::ErrorReadingFDD,
rti1516e::CouldNotCreateLogicalTimeFactory,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -237,12 +263,6 @@
std::string
fullPathNameToTheFDDfileAsString(fullPathNameToTheFDDfile.begin(),
fullPathNameToTheFDDfile.end());
req.setFEDid(fullPathNameToTheFDDfileAsString);
- /*#ifdef _WIN32
- if(!stricmp(FED,executionName)) {
- #else
- if(!strcasecmp(FED,exeName)) {
- #endif
- }*/
G.Out(pdGendoc," ====>executeService
CREATE_FEDERATION_EXECUTION");
privateRefs->executeService(&req, &rep);
@@ -254,11 +274,46 @@
// Ignored for now.
}
+void createFederationExecution (
+ std::wstring const & federationExecutionName,
+ std::vector<std::wstring> const & fomModules,
+ std::wstring const & logicalTimeImplementationName = L"")
+ throw (
+ rti1516e::CouldNotCreateLogicalTimeFactory,
+ rti1516e::InconsistentFDD,
+ rti1516e::ErrorReadingFDD,
+ rti1516e::CouldNotOpenFDD,
+ rti1516e::FederationExecutionAlreadyExists,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+void createFederationExecutionWithMIM (
+ std::wstring const & federationExecutionName,
+ std::vector<std::wstring> const & fomModules,
+ std::wstring const & mimModule,
+ std::wstring const & logicalTimeImplementationName = L"")
+ throw (
+ rti1516e::CouldNotCreateLogicalTimeFactory,
+ rti1516e::InconsistentFDD,
+ rti1516e::ErrorReadingFDD,
+ rti1516e::CouldNotOpenFDD,
+ rti1516e::DesignatorIsHLAstandardMIM,
+ rti1516e::ErrorReadingMIM,
+ rti1516e::CouldNotOpenMIM,
+ rti1516e::FederationExecutionAlreadyExists,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
// 4.3
void RTI1516ambassador::destroyFederationExecution
(std::wstring const & federationExecutionName)
throw (rti1516e::FederatesCurrentlyJoined,
rti1516e::FederationExecutionDoesNotExist,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Destroy_Federation_Execution req, rep ;
@@ -275,16 +330,55 @@
G.Out(pdGendoc,"exit RTI1516ambassador::destroyFederationExecution");
}
-// 4.4
+void RTI1516ambassador::listFederationExecutions ()
+ throw (
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
+ {
+throw rti1516e::RTIinternalError(L"Not Implemented");
+ }
+
+// 4.9
rti1516e::FederateHandle RTI1516ambassador::joinFederationExecution
-(std::wstring const & federateType,
+(
+ std::wstring const & federateType,
std::wstring const & federationExecutionName,
- rti1516e::FederateAmbassador & federateAmbassador)
-throw (rti1516e::FederateAlreadyExecutionMember,
+ std::vector<std::wstring> const & additionalFomModules)
+throw (rti1516e::CouldNotCreateLogicalTimeFactory,
rti1516e::FederationExecutionDoesNotExist,
+ rti1516e::InconsistentFDD,
+ rti1516e::ErrorReadingFDD,
+ rti1516e::CouldNotOpenFDD,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
- rti1516e::CouldNotCreateLogicalTimeFactory,
+ rti1516e::FederateAlreadyExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::CallNotAllowedFromWithinCallback,
+ rti1516e::RTIinternalError) {
+
+ // RTI shall provide a default federate name if none is provided
+ return this->joinFederationExecution(
+ L"defaultName",
+ federateType,
+ federationExecutionName,
+ additionalFomModules);
+}
+
+rti1516e::FederateHandle RTI1516ambassador::joinFederationExecution
+( std::wstring const & federateName,
+ std::wstring const & federateType,
+ std::wstring const & federationExecutionName,
+ std::vector<std::wstring> const & additionalFomModules)
+throw (rti1516e::CouldNotCreateLogicalTimeFactory,
+ rti1516e::FederationExecutionDoesNotExist,
+ rti1516e::InconsistentFDD,
+ rti1516e::ErrorReadingFDD,
+ rti1516e::CouldNotOpenFDD,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateAlreadyExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::CallNotAllowedFromWithinCallback,
rti1516e::RTIinternalError)
{
M_Join_Federation_Execution req, rep ;
@@ -292,7 +386,7 @@
G.Out(pdGendoc,"enter RTI1516ambassador::joinFederationExecution");
if ( &federateType == NULL || federateType.length() <= 0 ) {
- throw rti1516e::RTIinternalError(L"Incorrect or empty federate name");
+ throw rti1516e::RTIinternalError(L"Incorrect or empty federate type");
}
std::string federateTypeAsString(federateType.begin(), federateType.end());
@@ -300,7 +394,8 @@
throw rti1516e::RTIinternalError(L"Incorrect or empty federation
name");
std::string
federationExecutionNameAsString(federationExecutionName.begin(),
federationExecutionName.end());
- privateRefs->fed_amb = &federateAmbassador ;
+ // FIXME rti1516-2010 this should be done in connect (probably)
+ //privateRefs->fed_amb = &federateAmbassador ;
req.setFederateName(federateTypeAsString);
req.setFederationName(federationExecutionNameAsString);
@@ -318,9 +413,12 @@
// 4.5
void RTI1516ambassador::resignFederationExecution
(rti1516e::ResignAction resignAction)
-throw (rti1516e::OwnershipAcquisitionPending,
+throw (rti1516e::InvalidResignAction,
+ rti1516e::OwnershipAcquisitionPending,
rti1516e::FederateOwnsAttributes,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::CallNotAllowedFromWithinCallback,
rti1516e::RTIinternalError)
{
M_Resign_Federation_Execution req, rep ;
@@ -340,6 +438,7 @@
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Register_Federation_Synchronization_Point req, rep ;
@@ -367,6 +466,7 @@
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Register_Federation_Synchronization_Point req, rep ;
@@ -398,13 +498,14 @@
G.Out(pdGendoc,"exit
RTI1516ambassador::registerFederationSynchronizationPoint for some federates");
}
-// 4.9
+// 4.14
void RTI1516ambassador::synchronizationPointAchieved
-(std::wstring const & label)
+(std::wstring const & label, bool successfully)
throw (rti1516e::SynchronizationPointLabelNotAnnounced,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Synchronization_Point_Achieved req, rep ;
@@ -420,12 +521,13 @@
G.Out(pdGendoc,"exit RTI1516ambassador::synchronizationPointAchieved");
}
-// 4.11
+// 4.16
void RTI1516ambassador::requestFederationSave
(std::wstring const & label)
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Request_Federation_Save req, rep ;
@@ -449,6 +551,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Request_Federation_Save req, rep ;
@@ -472,6 +575,7 @@
throw (rti1516e::SaveNotInitiated,
rti1516e::FederateNotExecutionMember,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Federate_Save_Begun req, rep ;
@@ -489,6 +593,7 @@
throw (rti1516e::FederateHasNotBegunSave,
rti1516e::FederateNotExecutionMember,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Federate_Save_Complete req, rep ;
@@ -503,6 +608,7 @@
throw (rti1516e::FederateHasNotBegunSave,
rti1516e::FederateNotExecutionMember,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Federate_Save_Not_Complete req, rep ;
@@ -514,22 +620,32 @@
G.Out(pdGendoc,"exit RTI1516ambassador::federateSaveNotComplete");
}
-// 4.16
+void RTI1516ambassador::abortFederationSave ()
+ throw (rti1516e::FederateNotExecutionMember,
+ rti1516e::SaveNotInProgress,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 4.22
void RTI1516ambassador::queryFederationSaveStatus ()
throw (rti1516e::FederateNotExecutionMember,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
throw rti1516e::RTIinternalError(L"Not yet implemented");
}
-// 4.18
+// 4.24
void RTI1516ambassador::requestFederationRestore
(std::wstring const & label)
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Request_Federation_Restore req, rep ;
@@ -542,11 +658,12 @@
G.Out(pdGendoc,"exit RTI1516ambassador::requestFederationRestore");
}
-// 4.22
+// 4.28
void RTI1516ambassador::federateRestoreComplete ()
throw (rti1516e::RestoreNotRequested,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Federate_Restore_Complete req, rep ;
@@ -562,6 +679,7 @@
throw (rti1516e::RestoreNotRequested,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Federate_Restore_Not_Complete req, rep ;
@@ -573,10 +691,21 @@
G.Out(pdGendoc,"exit RTI1516ambassador::federateRestoreNotComplete");
}
+// 4.30
+void RTI1516ambassador::abortFederationRestore ()
+ throw (
+ rti1516e::RestoreNotInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
// 4.24
void RTI1516ambassador::queryFederationRestoreStatus ()
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -596,6 +725,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Publish_Object_Class req, rep ;
@@ -623,6 +753,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Unpublish_Object_Class req, rep ;
@@ -644,6 +775,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -657,6 +789,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Publish_Interaction_Class req, rep ;
@@ -673,6 +806,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Unpublish_Interaction_Class req, rep ;
@@ -686,12 +820,13 @@
void RTI1516ambassador::subscribeObjectClassAttributes
(rti1516e::ObjectClassHandle theClass,
rti1516e::AttributeHandleSet const & attributeList,
- bool active)
+ bool active, std::wstring const & updateRateDesignator)
throw (rti1516e::ObjectClassNotDefined,
rti1516e::AttributeNotDefined,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Subscribe_Object_Class_Attributes req, rep ;
@@ -719,6 +854,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Unsubscribe_Object_Class req, rep ;
@@ -737,6 +873,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -752,6 +889,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Subscribe_Interaction_Class req, rep ;
@@ -768,6 +906,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Unsubscribe_Interaction_Class req, rep ;
@@ -789,6 +928,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Reserve_Object_Instance_Name req, rep;
@@ -799,6 +939,46 @@
}
// 6.4
+void RTI1516ambassador::releaseObjectInstanceName (
+ std::wstring const & theObjectInstanceName)
+throw (
+ rti1516e::ObjectInstanceNameNotReserved,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 6.5
+void RTI1516ambassador::reserveMultipleObjectInstanceName (
+ std::set<std::wstring> const & theObjectInstanceNames)
+throw (
+ rti1516e::IllegalName,
+ rti1516e::NameSetWasEmpty,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 6.7
+void RTI1516ambassador::releaseMultipleObjectInstanceName (
+ std::set<std::wstring> const & theObjectInstanceNames)
+throw (
+ rti1516e::ObjectInstanceNameNotReserved,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 6.8
rti1516e::ObjectInstanceHandle RTI1516ambassador::registerObjectInstance
(rti1516e::ObjectClassHandle theClass)
throw (rti1516e::ObjectClassNotDefined,
@@ -806,6 +986,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Register_Object_Instance req, rep ;
@@ -825,6 +1006,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Register_Object_Instance req, rep ;
@@ -837,7 +1019,7 @@
return
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(rep.getObject());
}
-// 6.6
+// 6.10
void RTI1516ambassador::updateAttributeValues
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleValueMap const & theAttributeValues,
@@ -848,6 +1030,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
G.Out(pdGendoc,"enter RTI1516ambassador::updateAttributeValues without
time");
@@ -878,6 +1061,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
G.Out(pdGendoc,"enter RTI1516ambassador::updateAttributeValues with time");
@@ -903,7 +1087,7 @@
return
rti1516e::MessageRetractionHandleFriend::createRTI1516Handle(certiHandle,
serialNum);
}
-// 6.8
+// 6.12
void RTI1516ambassador::sendInteraction
(rti1516e::InteractionClassHandle theInteraction,
rti1516e::ParameterHandleValueMap const & theParameterValues,
@@ -914,6 +1098,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Send_Interaction req, rep ;
@@ -944,6 +1129,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Send_Interaction req, rep ;
@@ -970,7 +1156,7 @@
return rti1516handle;
}
-// 6.10
+// 6.14
void RTI1516ambassador::deleteObjectInstance
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::VariableLengthData const & theUserSuppliedTag)
@@ -979,6 +1165,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Delete_Object_Instance req, rep ;
@@ -1004,6 +1191,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Delete_Object_Instance req, rep ;
@@ -1036,6 +1224,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
throw rti1516e::RTIinternalError(L"unimplemented service
localDeleteObjectInstance");
@@ -1045,102 +1234,138 @@
privateRefs->executeService(&req, &rep);
}
-// 6.13
-void RTI1516ambassador::changeAttributeTransportationType
+// 6.19
+void RTI1516ambassador::requestAttributeValueUpdate
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleSet const & theAttributes,
- rti1516e::TransportationType theType)
+ rti1516e::VariableLengthData const & theUserSuppliedTag)
throw (rti1516e::ObjectInstanceNotKnown,
rti1516e::AttributeNotDefined,
- rti1516e::AttributeNotOwned,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Change_Attribute_Transportation_Type req, rep ;
+ M_Request_Object_Attribute_Value_Update req, rep ;
+
+ G.Out(pdGendoc,"enter
RTI1516ambassador::requestObjectAttributeValueUpdate");
req.setObject(rti1516e::ObjectInstanceHandleFriend::toCertiHandle(theObject));
- req.setTransportationType(toCertiTransportationType(theType));
- req.setAttributesSize(theAttributes.size());
+ size_t attr_num = theAttributes.size();
+ req.setAttributesSize( attr_num );
uint32_t i = 0;
- for ( rti1516e::AttributeHandleSet::const_iterator it =
theAttributes.begin(); it != theAttributes.end(); it++, ++i)
+ for ( rti1516e::AttributeHandleSet::const_iterator it =
theAttributes.begin(); i < attr_num; ++it, ++i)
{
req.setAttributes(rti1516e::AttributeHandleFriend::toCertiHandle(*it),i);
}
+ req.setTag(varLengthDataAsString(theUserSuppliedTag));
privateRefs->executeService(&req, &rep);
+ G.Out(pdGendoc,"exit
RTI1516ambassador::requestObjectAttributeValueUpdate");
}
-// 6.14
-void RTI1516ambassador::changeInteractionTransportationType
-(rti1516e::InteractionClassHandle theClass,
- rti1516e::TransportationType theType)
-throw (rti1516e::InteractionClassNotDefined,
- rti1516e::InteractionClassNotPublished,
+void RTI1516ambassador::requestAttributeValueUpdate
+(rti1516e::ObjectClassHandle theClass,
+ rti1516e::AttributeHandleSet const & theAttributes,
+ rti1516e::VariableLengthData const & theUserSuppliedTag)
+throw (rti1516e::ObjectClassNotDefined,
+ rti1516e::AttributeNotDefined,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Change_Interaction_Transportation_Type req, rep ;
+ M_Request_Class_Attribute_Value_Update req, rep ;
+ G.Out(pdGendoc,"enter
RTI1516ambassador::requestClassAttributeValueUpdate");
+
req.setObjectClass(rti1516e::ObjectClassHandleFriend::toCertiHandle(theClass));
-
req.setInteractionClass(rti1516e::InteractionClassHandleFriend::toCertiHandle(theClass));
- req.setTransportationType(toCertiTransportationType(theType));
+ assignAHSAndExecuteService(theAttributes, req, rep);
- privateRefs->executeService(&req, &rep);
+ G.Out(pdGendoc,"exit RTI1516ambassador::requestClassAttributeValueUpdate");
}
-// 6.17
-void RTI1516ambassador::requestAttributeValueUpdate
+// 6.23
+void RTI1516ambassador::requestAttributeTransportationTypeChange
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleSet const & theAttributes,
- rti1516e::VariableLengthData const & theUserSuppliedTag)
-throw (rti1516e::ObjectInstanceNotKnown,
+ rti1516e::TransportationType theType)
+throw (rti1516e::AttributeAlreadyBeingChanged,
+ rti1516e::ObjectInstanceNotKnown,
rti1516e::AttributeNotDefined,
+ rti1516e::AttributeNotOwned,
rti1516e::FederateNotExecutionMember,
+ rti1516e::InvalidTransportationType,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Request_Object_Attribute_Value_Update req, rep ;
-
- G.Out(pdGendoc,"enter
RTI1516ambassador::requestObjectAttributeValueUpdate");
+ M_Change_Attribute_Transportation_Type req, rep ;
req.setObject(rti1516e::ObjectInstanceHandleFriend::toCertiHandle(theObject));
+ req.setTransportationType(toCertiTransportationType(theType));
- size_t attr_num = theAttributes.size();
- req.setAttributesSize( attr_num );
+ req.setAttributesSize(theAttributes.size());
uint32_t i = 0;
- for ( rti1516e::AttributeHandleSet::const_iterator it =
theAttributes.begin(); i < attr_num; ++it, ++i)
+ for ( rti1516e::AttributeHandleSet::const_iterator it =
theAttributes.begin(); it != theAttributes.end(); it++, ++i)
{
req.setAttributes(rti1516e::AttributeHandleFriend::toCertiHandle(*it),i);
}
- req.setTag(varLengthDataAsString(theUserSuppliedTag));
privateRefs->executeService(&req, &rep);
- G.Out(pdGendoc,"exit
RTI1516ambassador::requestObjectAttributeValueUpdate");
}
-
-void RTI1516ambassador::requestAttributeValueUpdate
-(rti1516e::ObjectClassHandle theClass,
- rti1516e::AttributeHandleSet const & theAttributes,
- rti1516e::VariableLengthData const & theUserSuppliedTag)
-throw (rti1516e::ObjectClassNotDefined,
+// 6.25
+void RTI1516ambassador::queryAttributeTransportationType (
+ rti1516e::ObjectInstanceHandle theObject,
+ rti1516e::AttributeHandle theAttribute)
+throw (
rti1516e::AttributeNotDefined,
+ rti1516e::ObjectInstanceNotKnown,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 6.27
+void RTI1516ambassador::requestInteractionTransportationTypeChange
+(rti1516e::InteractionClassHandle theClass,
+ rti1516e::TransportationType theType)
+throw (rti1516e::InteractionClassAlreadyBeingChanged,
+ rti1516e::InteractionClassNotPublished,
+ rti1516e::InteractionClassNotDefined,
+ rti1516e::InvalidTransportationType,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Request_Class_Attribute_Value_Update req, rep ;
- G.Out(pdGendoc,"enter
RTI1516ambassador::requestClassAttributeValueUpdate");
-
req.setObjectClass(rti1516e::ObjectClassHandleFriend::toCertiHandle(theClass));
+ M_Change_Interaction_Transportation_Type req, rep ;
- assignAHSAndExecuteService(theAttributes, req, rep);
+
req.setInteractionClass(rti1516e::InteractionClassHandleFriend::toCertiHandle(theClass));
+ req.setTransportationType(toCertiTransportationType(theType));
- G.Out(pdGendoc,"exit RTI1516ambassador::requestClassAttributeValueUpdate");
+ privateRefs->executeService(&req, &rep);
}
+// 6.29
+void RTI1516ambassador::queryInteractionTransportationType (
+ rti1516e::FederateHandle theFederate,
+ rti1516e::InteractionClassHandle theInteraction)
+ throw (
+ rti1516e::InteractionClassNotDefined,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
///////////////////////////////////
// Ownership Management Services //
///////////////////////////////////
@@ -1154,6 +1379,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Unconditional_Attribute_Ownership_Divestiture req, rep ;
@@ -1181,6 +1407,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Negotiated_Attribute_Ownership_Divestiture req, rep ;
@@ -1213,6 +1440,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1232,6 +1460,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Attribute_Ownership_Acquisition req, rep ;
@@ -1266,6 +1495,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Attribute_Ownership_Acquisition_If_Available req, rep ;
@@ -1282,7 +1512,22 @@
privateRefs->executeService(&req, &rep);
}
-// 7.12 (in RTI1.3 this function is called: AttributeOwnershipReleaseResponse)
+void RTI1516ambassador::attributeOwnershipReleaseDenied (
+ rti1516e::ObjectInstanceHandle theObject,
+ rti1516e::AttributeHandleSet const & theAttributes)
+ throw (
+ rti1516e::AttributeNotOwned,
+ rti1516e::AttributeNotDefined,
+ rti1516e::ObjectInstanceNotKnown,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 7.13 (in RTI1.3 this function is called: AttributeOwnershipReleaseResponse)
void RTI1516ambassador::attributeOwnershipDivestitureIfWanted
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleSet const & theAttributes,
@@ -1293,6 +1538,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Attribute_Ownership_Release_Response req, rep ;
@@ -1310,7 +1556,7 @@
}
-// 7.13
+// 7.15
void RTI1516ambassador::cancelNegotiatedAttributeOwnershipDivestiture
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleSet const & theAttributes)
@@ -1321,6 +1567,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Cancel_Negotiated_Attribute_Ownership_Divestiture req, rep ;
@@ -1337,7 +1584,7 @@
privateRefs->executeService(&req, &rep);
}
-// 7.14
+// 7.15
void RTI1516ambassador::cancelAttributeOwnershipAcquisition
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleSet const & theAttributes)
@@ -1348,6 +1595,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Cancel_Attribute_Ownership_Acquisition req, rep ;
@@ -1373,6 +1621,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Query_Attribute_Ownership req, rep ;
@@ -1392,6 +1641,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Is_Attribute_Owned_By_Federate req, rep ;
@@ -1418,6 +1668,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Enable_Time_Regulation req, rep ;
@@ -1446,6 +1697,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Disable_Time_Regulation req, rep ;
@@ -1461,6 +1713,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Enable_Time_Constrained req, rep ;
@@ -1473,6 +1726,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Disable_Time_Constrained req, rep ;
@@ -1490,6 +1744,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Time_Advance_Request req, rep ;
@@ -1510,6 +1765,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Time_Advance_Request_Available req, rep ;
@@ -1531,6 +1787,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Next_Event_Request req, rep ;
@@ -1552,6 +1809,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Next_Event_Request_Available req, rep ;
@@ -1573,6 +1831,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
// JvY: Implementation copied from previous CERTI implementation,
including immediate throw.
@@ -1591,6 +1850,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
// throw AsynchronousDeliveryAlreadyEnabled("Default value (non HLA)");
@@ -1606,6 +1866,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Disable_Asynchronous_Delivery req, rep ;
@@ -1618,6 +1879,7 @@
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
//TODO JRE: goed testen! Is GALT wel precies het zelfde als LBTS?
@@ -1642,6 +1904,7 @@
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Query_Federate_Time req, rep ;
@@ -1657,6 +1920,7 @@
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
//TODO JRE: goed testen! Is LITS wel precies het zelfde als
QueryMinNextEventTime?
@@ -1684,6 +1948,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1696,6 +1961,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1705,12 +1971,13 @@
// 8.21
void RTI1516ambassador::retract
(rti1516e::MessageRetractionHandle theHandle)
-throw (rti1516e::InvalidRetractionHandle,
+throw (rti1516e::InvalidMessageRetractionHandle,
rti1516e::TimeRegulationIsNotEnabled,
rti1516e::MessageCanNoLongerBeRetracted,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
throw rti1516e::RTIinternalError(L"Unimplemented Service retract");
@@ -1733,6 +2000,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Change_Attribute_Order_Type req, rep ;
@@ -1752,6 +2020,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Change_Interaction_Order_Type req, rep ;
@@ -1773,6 +2042,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1787,6 +2057,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1795,13 +2066,14 @@
// 9.4
void RTI1516ambassador::deleteRegion
-(rti1516e::RegionHandle theRegion)
-throw (rti1516e::InvalidRegion,
+(rti1516e::RegionHandle const & theRegion)
+throw (rti1516e::RegionInUseForUpdateOrSubscription,
rti1516e::RegionNotCreatedByThisFederate,
- rti1516e::RegionInUseForUpdateOrSubscription,
- rti1516e::FederateNotExecutionMember,
+ rti1516e::InvalidRegion,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1823,6 +2095,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1846,6 +2119,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1865,6 +2139,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1883,6 +2158,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1894,7 +2170,7 @@
(rti1516e::ObjectClassHandle theClass,
rti1516e::AttributeHandleSetRegionHandleSetPairVector const &
theAttributeHandleSetRegionHandleSetPairVector,
- bool active)
+ bool active, std::wstring const & updateRateDesignator)
throw (rti1516e::ObjectClassNotDefined,
rti1516e::AttributeNotDefined,
rti1516e::InvalidRegion,
@@ -1903,6 +2179,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1921,6 +2198,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1940,6 +2218,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1956,6 +2235,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1977,6 +2257,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -1999,6 +2280,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -2018,6 +2300,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
/* TODO */
@@ -2029,10 +2312,54 @@
//////////////////////////
// 10.2
+rti1516e::ResignAction RTI1516ambassador::getAutomaticResignDirective ()
+throw (
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 10.3
+void RTI1516ambassador::setAutomaticResignDirective (
+ rti1516e::ResignAction resignAction)
+throw (
+ rti1516e::InvalidResignAction,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError){
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 10.4
+rti1516e::FederateHandle RTI1516ambassador::getFederateHandle (
+ std::wstring const & theName)
+throw (
+ rti1516e::NameNotFound,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError){
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 10.5
+std::wstring RTI1516ambassador::getFederateName (
+ rti1516e::FederateHandle theHandle)
+throw (
+ rti1516e::InvalidFederateHandle,
+ rti1516e::FederateHandleNotKnown,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 10.2
rti1516e::ObjectClassHandle RTI1516ambassador::getObjectClassHandle
(std::wstring const & theName)
throw (rti1516e::NameNotFound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Get_Object_Class_Handle req, rep ;
@@ -2049,11 +2376,11 @@
return rti1516Handle;
}
-// 10.3
std::wstring RTI1516ambassador::getObjectClassName
(rti1516e::ObjectClassHandle theHandle)
throw (rti1516e::InvalidObjectClassHandle,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Get_Object_Class_Name req, rep ;
@@ -2074,13 +2401,63 @@
return nameWString;
}
-// 10.4
+rti1516e::ObjectClassHandle RTI1516ambassador::getKnownObjectClassHandle
+(rti1516e::ObjectInstanceHandle theObject)
+throw (rti1516e::ObjectInstanceNotKnown,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
+ {
+ M_Get_Object_Class req, rep ;
+
+
req.setObject(rti1516e::ObjectInstanceHandleFriend::toCertiHandle(theObject));
+ privateRefs->executeService(&req, &rep);
+ return
rti1516e::ObjectClassHandleFriend::createRTI1516Handle(rep.getObjectClass());
+ }
+
+// 10.10
+rti1516e::ObjectInstanceHandle RTI1516ambassador::getObjectInstanceHandle
+(std::wstring const & theName)
+throw (rti1516e::ObjectInstanceNotKnown,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
+ {
+ M_Get_Object_Instance_Handle req, rep ;
+ std::string nameString(theName.begin(), theName.end());
+ req.setObjectInstanceName(nameString);
+
+ privateRefs->executeService(&req, &rep);
+ return
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(rep.getObject());
+ }
+
+// 10.11
+std::wstring RTI1516ambassador::getObjectInstanceName
+(rti1516e::ObjectInstanceHandle theHandle)
+throw (rti1516e::ObjectInstanceNotKnown,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
+ {
+ M_Get_Object_Instance_Name req, rep ;
+
req.setObject(rti1516e::ObjectInstanceHandleFriend::toCertiHandle(theHandle));
+ privateRefs->executeService(&req, &rep);
+
+ //return hla_strdup(rep.getObjectInstanceName());
+ std::string nameString = rep.getObjectInstanceName();
+ std::wstring nameWString(nameString.begin(), nameString.end());
+
+ return nameWString;
+ }
+
+
rti1516e::AttributeHandle RTI1516ambassador::getAttributeHandle
(rti1516e::ObjectClassHandle whichClass,
std::wstring const & theAttributeName)
throw (rti1516e::InvalidObjectClassHandle,
rti1516e::NameNotFound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
G.Out(pdGendoc,"enter RTI::RTI1516ambassador::getAttributeHandle");
@@ -2101,13 +2478,10 @@
}
}
-
-
G.Out(pdGendoc,"exit RTI::RTI1516ambassador::getAttributeHandle");
return
rti1516e::AttributeHandleFriend::createRTI1516Handle(rep.getAttribute());
}
-// 10.5
std::wstring RTI1516ambassador::getAttributeName
(rti1516e::ObjectClassHandle whichClass,
rti1516e::AttributeHandle theHandle)
@@ -2115,6 +2489,7 @@
rti1516e::InvalidAttributeHandle,
rti1516e::AttributeNotDefined,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Get_Attribute_Name req, rep ;
@@ -2151,11 +2526,36 @@
return nameWString;
}
+// 10.13
+double RTI1516ambassador::getUpdateRateValue (
+ std::wstring const & updateRateDesignator)
+throw (
+ rti1516e::InvalidUpdateRateDesignator,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
+// 10.14
+double RTI1516ambassador::getUpdateRateValueForAttribute (
+ rti1516e::ObjectInstanceHandle theObject,
+ rti1516e::AttributeHandle theAttribute)
+throw (
+ rti1516e::ObjectInstanceNotKnown,
+ rti1516e::AttributeNotDefined,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
// 10.6
rti1516e::InteractionClassHandle RTI1516ambassador::getInteractionClassHandle
(std::wstring const & theName)
throw (rti1516e::NameNotFound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Get_Interaction_Class_Handle req, rep ;
@@ -2172,6 +2572,7 @@
(rti1516e::InteractionClassHandle theHandle)
throw (rti1516e::InvalidInteractionClassHandle,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Get_Interaction_Class_Name req, rep ;
@@ -2203,6 +2604,7 @@
throw (rti1516e::InvalidInteractionClassHandle,
rti1516e::NameNotFound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Get_Parameter_Handle req, rep ;
@@ -2234,6 +2636,7 @@
rti1516e::InvalidParameterHandle,
rti1516e::InteractionParameterNotDefined,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Get_Parameter_Name req, rep ;
@@ -2261,85 +2664,79 @@
return nameWString;
}
-// 10.10
-rti1516e::ObjectInstanceHandle RTI1516ambassador::getObjectInstanceHandle
-(std::wstring const & theName)
-throw (rti1516e::ObjectInstanceNotKnown,
+// 10.20
+rti1516e::OrderType RTI1516ambassador::getOrderType
+(std::wstring const & orderName)
+throw (rti1516e::InvalidOrderName,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Get_Object_Instance_Handle req, rep ;
- std::string nameString(theName.begin(), theName.end());
- req.setObjectInstanceName(nameString);
+ M_Get_Ordering_Handle req, rep ;
+ std::string nameAsString(orderName.begin(), orderName.end());
+ req.setOrderingName(nameAsString);
privateRefs->executeService(&req, &rep);
- return
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(rep.getObject());
+
+ return certi::toRTI1516OrderType(rep.getOrdering());
}
-// 10.11
-std::wstring RTI1516ambassador::getObjectInstanceName
-(rti1516e::ObjectInstanceHandle theHandle)
-throw (rti1516e::ObjectInstanceNotKnown,
+// 10.21
+std::wstring RTI1516ambassador::getOrderName
+(rti1516e::OrderType orderType)
+throw (rti1516e::InvalidOrderType,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Get_Object_Instance_Name req, rep ;
-
req.setObject(rti1516e::ObjectInstanceHandleFriend::toCertiHandle(theHandle));
+ M_Get_Ordering_Name req, rep ;
+
+ req.setOrdering(certi::toCertiOrderType(orderType));
privateRefs->executeService(&req, &rep);
- //return hla_strdup(rep.getObjectInstanceName());
- std::string nameString = rep.getObjectInstanceName();
+ //return hla_strdup(rep.getOrderingName());
+ std::string nameString = rep.getOrderingName();
std::wstring nameWString(nameString.begin(), nameString.end());
return nameWString;
}
-// 10.12
-rti1516e::DimensionHandle RTI1516ambassador::getDimensionHandle
-(std::wstring const & theName)
-throw (rti1516e::NameNotFound,
+// 10.18
+rti1516e::TransportationType RTI1516ambassador::getTransportationType
+(std::wstring const & transportationName)
+throw (rti1516e::InvalidTransportationName,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Get_Dimension_Handle req, rep ;
-
- std::string nameString(theName.begin(), theName.end());
- req.setDimensionName(nameString);
- //req.setSpace(space); //SPACE NIET NODIG IN 1516 STANDAARD???
+ M_Get_Transportation_Handle req, rep ;
+ std::string nameString(transportationName.begin(),
transportationName.end());
+ req.setTransportationName(nameString);
privateRefs->executeService(&req, &rep);
- return
rti1516e::DimensionHandleFriend::createRTI1516Handle(rep.getDimension());
+
+ return certi::toRTI1516TransportationType(rep.getTransportation());
}
-// 10.13
-std::wstring RTI1516ambassador::getDimensionName
-(rti1516e::DimensionHandle theHandle)
-throw (rti1516e::InvalidDimensionHandle,
+// 10.19
+std::wstring RTI1516ambassador::getTransportationName
+(rti1516e::TransportationType transportationType)
+throw (rti1516e::InvalidTransportationType,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Get_Dimension_Name req, rep ;
+ M_Get_Transportation_Name req, rep ;
-
req.setDimension(rti1516e::DimensionHandleFriend::toCertiHandle(theHandle));
- //req.setSpace(space);
+
req.setTransportation(certi::toCertiTransportationType(transportationType));
privateRefs->executeService(&req, &rep);
- //return hla_strdup(rep.getDimensionName());
- std::string nameString = rep.getDimensionName();
+
+ //return hla_strdup(rep.getTransportationName());
+ std::string nameString = rep.getTransportationName();
std::wstring nameWString(nameString.begin(), nameString.end());
return nameWString;
}
-// 10.14
-unsigned long RTI1516ambassador::getDimensionUpperBound
-(rti1516e::DimensionHandle theHandle)
-throw (rti1516e::InvalidDimensionHandle,
- rti1516e::FederateNotExecutionMember,
- rti1516e::RTIinternalError)
- {
- /* TODO */
- throw rti1516e::RTIinternalError(L"Not yet implemented");
- }
-
// 10.15
rti1516e::DimensionHandleSet
RTI1516ambassador::getAvailableDimensionsForClassAttribute
(rti1516e::ObjectClassHandle theClass,
@@ -2348,6 +2745,7 @@
rti1516e::InvalidAttributeHandle,
rti1516e::AttributeNotDefined,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Get_Attribute_Space_Handle req, rep ;
@@ -2362,25 +2760,12 @@
return invalidSet;
}
-// 10.16
-rti1516e::ObjectClassHandle RTI1516ambassador::getKnownObjectClassHandle
-(rti1516e::ObjectInstanceHandle theObject)
-throw (rti1516e::ObjectInstanceNotKnown,
- rti1516e::FederateNotExecutionMember,
- rti1516e::RTIinternalError)
- {
- M_Get_Object_Class req, rep ;
-
-
req.setObject(rti1516e::ObjectInstanceHandleFriend::toCertiHandle(theObject));
- privateRefs->executeService(&req, &rep);
- return
rti1516e::ObjectClassHandleFriend::createRTI1516Handle(rep.getObjectClass());
- }
-
// 10.17
rti1516e::DimensionHandleSet
RTI1516ambassador::getAvailableDimensionsForInteractionClass
(rti1516e::InteractionClassHandle theClass)
throw (rti1516e::InvalidInteractionClassHandle,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Get_Interaction_Space_Handle req, rep ;
@@ -2394,75 +2779,132 @@
return invalidSet;
}
-// 10.18
-rti1516e::TransportationType RTI1516ambassador::getTransportationType
-(std::wstring const & transportationName)
-throw (rti1516e::InvalidTransportationName,
+
+// 10.12
+rti1516e::DimensionHandle RTI1516ambassador::getDimensionHandle
+(std::wstring const & theName)
+throw (rti1516e::NameNotFound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Get_Transportation_Handle req, rep ;
- std::string nameString(transportationName.begin(),
transportationName.end());
- req.setTransportationName(nameString);
- privateRefs->executeService(&req, &rep);
+ M_Get_Dimension_Handle req, rep ;
- return certi::toRTI1516TransportationType(rep.getTransportation());
+ std::string nameString(theName.begin(), theName.end());
+ req.setDimensionName(nameString);
+ //req.setSpace(space); //SPACE NIET NODIG IN 1516 STANDAARD???
+ privateRefs->executeService(&req, &rep);
+ return
rti1516e::DimensionHandleFriend::createRTI1516Handle(rep.getDimension());
}
-// 10.19
-std::wstring RTI1516ambassador::getTransportationName
-(rti1516e::TransportationType transportationType)
-throw (rti1516e::InvalidTransportationType,
+// 10.13
+std::wstring RTI1516ambassador::getDimensionName
+(rti1516e::DimensionHandle theHandle)
+throw (rti1516e::InvalidDimensionHandle,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Get_Transportation_Name req, rep ;
+ M_Get_Dimension_Name req, rep ;
-
req.setTransportation(certi::toCertiTransportationType(transportationType));
+
req.setDimension(rti1516e::DimensionHandleFriend::toCertiHandle(theHandle));
+ //req.setSpace(space);
privateRefs->executeService(&req, &rep);
-
- //return hla_strdup(rep.getTransportationName());
- std::string nameString = rep.getTransportationName();
+ //return hla_strdup(rep.getDimensionName());
+ std::string nameString = rep.getDimensionName();
std::wstring nameWString(nameString.begin(), nameString.end());
return nameWString;
}
-// 10.20
-rti1516e::OrderType RTI1516ambassador::getOrderType
-(std::wstring const & orderName)
-throw (rti1516e::InvalidOrderName,
+// 10.14
+unsigned long RTI1516ambassador::getDimensionUpperBound
+(rti1516e::DimensionHandle theHandle)
+throw (rti1516e::InvalidDimensionHandle,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Get_Ordering_Handle req, rep ;
+ /* TODO */
+ throw rti1516e::RTIinternalError(L"Not yet implemented");
+ }
- std::string nameAsString(orderName.begin(), orderName.end());
- req.setOrderingName(nameAsString);
- privateRefs->executeService(&req, &rep);
+// 10.30
- return certi::toRTI1516OrderType(rep.getOrdering());
+rti1516e::DimensionHandleSet RTI1516ambassador::getDimensionHandleSet
+(rti1516e::RegionHandle theRegionHandle)
+throw (rti1516e::InvalidRegion,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
+ {
+ /* TODO */
+ throw rti1516e::RTIinternalError(L"Not yet implemented");
}
-// 10.21
-std::wstring RTI1516ambassador::getOrderName
-(rti1516e::OrderType orderType)
-throw (rti1516e::InvalidOrderType,
+// 10.31
+
+rti1516e::RangeBounds RTI1516ambassador::getRangeBounds
+(rti1516e::RegionHandle theRegionHandle,
+ rti1516e::DimensionHandle theDimensionHandle)
+throw (rti1516e::InvalidRegion,
+ rti1516e::RegionDoesNotContainSpecifiedDimension,
rti1516e::FederateNotExecutionMember,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
- M_Get_Ordering_Name req, rep ;
+ /* TODO */
+ throw rti1516e::RTIinternalError(L"Not yet implemented");
+ }
- req.setOrdering(certi::toCertiOrderType(orderType));
- privateRefs->executeService(&req, &rep);
+// 10.32
+void RTI1516ambassador::setRangeBounds
+(rti1516e::RegionHandle theRegionHandle,
+ rti1516e::DimensionHandle theDimensionHandle,
+ rti1516e::RangeBounds const & theRangeBounds)
+throw (rti1516e::InvalidRegion,
+ rti1516e::RegionNotCreatedByThisFederate,
+ rti1516e::RegionDoesNotContainSpecifiedDimension,
+ rti1516e::InvalidRangeBound,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
+ {
+ /* TODO */
+ throw rti1516e::RTIinternalError(L"Not yet implemented");
+ }
- //return hla_strdup(rep.getOrderingName());
- std::string nameString = rep.getOrderingName();
- std::wstring nameWString(nameString.begin(), nameString.end());
+// 10.33
+unsigned long RTI1516ambassador::normalizeFederateHandle
+(rti1516e::FederateHandle theFederateHandle)
+throw (rti1516e::FederateNotExecutionMember,
+ rti1516e::InvalidFederateHandle,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
+ {
+ /* TODO */
+ throw rti1516e::RTIinternalError(L"Not yet implemented");
+ }
- return nameWString;
+// 10.34
+unsigned long RTI1516ambassador::normalizeServiceGroup
+(rti1516e::ServiceGroup theServiceGroup)
+throw (rti1516e::FederateNotExecutionMember,
+ rti1516e::InvalidServiceGroup,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
+ {
+ /* TODO */
+ throw rti1516e::RTIinternalError(L"Not yet implemented");
}
+
// 10.22
/**
* Sets the ClassRelevanceAdvisory (CRA) switch to true. The switch
@@ -2487,6 +2929,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Enable_Class_Relevance_Advisory_Switch req, rep ;
@@ -2517,6 +2960,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Disable_Class_Relevance_Advisory_Switch req, rep ;
@@ -2548,6 +2992,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Enable_Attribute_Relevance_Advisory_Switch req, rep ;
@@ -2579,6 +3024,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Disable_Attribute_Relevance_Advisory_Switch req, rep ;
@@ -2609,6 +3055,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Enable_Attribute_Scope_Advisory_Switch req, rep ;
@@ -2639,6 +3086,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Disable_Attribute_Scope_Advisory_Switch req, rep ;
@@ -2669,6 +3117,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Enable_Interaction_Relevance_Advisory_Switch req, rep ;
@@ -2699,85 +3148,17 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError)
{
M_Disable_Interaction_Relevance_Advisory_Switch req, rep ;
privateRefs->executeService(&req, &rep);
}
-// 10.30
-
-rti1516e::DimensionHandleSet RTI1516ambassador::getDimensionHandleSet
-(rti1516e::RegionHandle theRegionHandle)
-throw (rti1516e::InvalidRegion,
- rti1516e::FederateNotExecutionMember,
- rti1516e::SaveInProgress,
- rti1516e::RestoreInProgress,
- rti1516e::RTIinternalError)
- {
- /* TODO */
- throw rti1516e::RTIinternalError(L"Not yet implemented");
- }
-
-// 10.31
-
-rti1516e::RangeBounds RTI1516ambassador::getRangeBounds
-(rti1516e::RegionHandle theRegionHandle,
- rti1516e::DimensionHandle theDimensionHandle)
-throw (rti1516e::InvalidRegion,
- rti1516e::RegionDoesNotContainSpecifiedDimension,
- rti1516e::FederateNotExecutionMember,
- rti1516e::SaveInProgress,
- rti1516e::RestoreInProgress,
- rti1516e::RTIinternalError)
- {
- /* TODO */
- throw rti1516e::RTIinternalError(L"Not yet implemented");
- }
-
-// 10.32
-void RTI1516ambassador::setRangeBounds
-(rti1516e::RegionHandle theRegionHandle,
- rti1516e::DimensionHandle theDimensionHandle,
- rti1516e::RangeBounds const & theRangeBounds)
-throw (rti1516e::InvalidRegion,
- rti1516e::RegionNotCreatedByThisFederate,
- rti1516e::RegionDoesNotContainSpecifiedDimension,
- rti1516e::InvalidRangeBound,
- rti1516e::FederateNotExecutionMember,
- rti1516e::SaveInProgress,
- rti1516e::RestoreInProgress,
- rti1516e::RTIinternalError)
- {
- /* TODO */
- throw rti1516e::RTIinternalError(L"Not yet implemented");
- }
-
-// 10.33
-unsigned long RTI1516ambassador::normalizeFederateHandle
-(rti1516e::FederateHandle theFederateHandle)
-throw (rti1516e::FederateNotExecutionMember,
- rti1516e::InvalidFederateHandle,
- rti1516e::RTIinternalError)
- {
- /* TODO */
- throw rti1516e::RTIinternalError(L"Not yet implemented");
- }
-
-// 10.34
-unsigned long RTI1516ambassador::normalizeServiceGroup
-(rti1516e::ServiceGroupIndicator theServiceGroup)
-throw (rti1516e::FederateNotExecutionMember,
- rti1516e::InvalidServiceGroup,
- rti1516e::RTIinternalError)
- {
- /* TODO */
- throw rti1516e::RTIinternalError(L"Not yet implemented");
- }
// 10.37
bool RTI1516ambassador::evokeCallback(double approximateMinimumTimeInSeconds)
-throw (rti1516e::FederateNotExecutionMember,
+throw (rti1516e::CallNotAllowedFromWithinCallback,
rti1516e::RTIinternalError)
{
return __tick_kernel(false, approximateMinimumTimeInSeconds,
approximateMinimumTimeInSeconds);
@@ -2786,7 +3167,7 @@
// 10.38
bool RTI1516ambassador::evokeMultipleCallbacks(double
approximateMinimumTimeInSeconds,
double approximateMaximumTimeInSeconds)
-throw (rti1516e::FederateNotExecutionMember,
+throw (rti1516e::CallNotAllowedFromWithinCallback,
rti1516e::RTIinternalError)
{
return __tick_kernel(true, approximateMinimumTimeInSeconds,
approximateMaximumTimeInSeconds);
@@ -2794,7 +3175,7 @@
// 10.39
void RTI1516ambassador::enableCallbacks ()
-throw (rti1516e::FederateNotExecutionMember,
+throw (
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
rti1516e::RTIinternalError)
@@ -2805,7 +3186,7 @@
// 10.40
void RTI1516ambassador::disableCallbacks ()
-throw (rti1516e::FederateNotExecutionMember,
+throw (
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
rti1516e::RTIinternalError)
@@ -2814,56 +3195,110 @@
throw rti1516e::RTIinternalError(L"Not yet implemented");
}
+std::auto_ptr<rti1516e::LogicalTimeFactory> RTI1516ambassador::getTimeFactory
() const
+ throw (
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError) {
+ /* FIXME this must be fixed ASAP */
+ throw rti1516e::RTIinternalError(L"Not Implemented");
+}
+
rti1516e::FederateHandle RTI1516ambassador::decodeFederateHandle(
rti1516e::VariableLengthData const & encodedValue) const
+throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
{
return rti1516e::FederateHandleFriend::createRTI1516Handle(encodedValue);
}
rti1516e::ObjectClassHandle RTI1516ambassador::decodeObjectClassHandle(
rti1516e::VariableLengthData const & encodedValue) const
+throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
{
return
rti1516e::ObjectClassHandleFriend::createRTI1516Handle(encodedValue);
}
rti1516e::InteractionClassHandle
RTI1516ambassador::decodeInteractionClassHandle(
rti1516e::VariableLengthData const & encodedValue) const
+throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
{
return
rti1516e::InteractionClassHandleFriend::createRTI1516Handle(encodedValue);
}
rti1516e::ObjectInstanceHandle RTI1516ambassador::decodeObjectInstanceHandle(
rti1516e::VariableLengthData const & encodedValue) const
+throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
{
return
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(encodedValue);
}
rti1516e::AttributeHandle RTI1516ambassador::decodeAttributeHandle(
rti1516e::VariableLengthData const & encodedValue) const
+throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
{
return rti1516e::AttributeHandleFriend::createRTI1516Handle(encodedValue);
}
rti1516e::ParameterHandle RTI1516ambassador::decodeParameterHandle(
rti1516e::VariableLengthData const & encodedValue) const
+throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
{
return rti1516e::ParameterHandleFriend::createRTI1516Handle(encodedValue);
}
rti1516e::DimensionHandle RTI1516ambassador::decodeDimensionHandle(
rti1516e::VariableLengthData const & encodedValue) const
+throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
{
return rti1516e::DimensionHandleFriend::createRTI1516Handle(encodedValue);
}
rti1516e::MessageRetractionHandle
RTI1516ambassador::decodeMessageRetractionHandle(
rti1516e::VariableLengthData const & encodedValue) const
+throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
{
return
rti1516e::MessageRetractionHandleFriend::createRTI1516Handle(encodedValue);
}
rti1516e::RegionHandle RTI1516ambassador::decodeRegionHandle(
rti1516e::VariableLengthData const & encodedValue) const
+throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError)
{
return rti1516e::RegionHandleFriend::createRTI1516Handle(encodedValue);
}
Index: libRTI/ieee1516-2010/RTIambPrivateRefs.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/RTIambPrivateRefs.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/ieee1516-2010/RTIambPrivateRefs.cpp 6 Mar 2014 16:11:32 -0000
1.1
+++ libRTI/ieee1516-2010/RTIambPrivateRefs.cpp 7 Mar 2014 18:00:49 -0000
1.2
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambPrivateRefs.cpp,v 1.1 2014/03/06 16:11:32 erk Exp $
+// $Id: RTIambPrivateRefs.cpp,v 1.2 2014/03/07 18:00:49 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -59,12 +59,12 @@
}
template<typename T>
-std::vector<std::pair<rti1516::ParameterHandle, ParameterValue_t> >
+std::vector<std::pair<rti1516e::ParameterHandle, ParameterValue_t> >
getPHVPSFromRequest(T* request)
{
uint32_t size = request->getParametersSize();
- std::vector<std::pair<rti1516::ParameterHandle, ParameterValue_t> >
result;
+ std::vector<std::pair<rti1516e::ParameterHandle, ParameterValue_t> >
result;
result.resize(size);
for (uint32_t i = 0 ; i < size ; ++i) {
@@ -76,63 +76,63 @@
}
template<typename T>
-rti1516::AttributeHandleValueMap *
+rti1516e::AttributeHandleValueMap *
getAHVMFromRequest(T* request)
{
uint32_t size = request->getAttributesSize();
- rti1516::AttributeHandleValueMap *result = new
rti1516::AttributeHandleValueMap();
+ rti1516e::AttributeHandleValueMap *result = new
rti1516e::AttributeHandleValueMap();
for (uint32_t i = 0 ; i < size ; ++i) {
- rti1516::AttributeHandle attribute =
rti1516::AttributeHandleFriend::createRTI1516Handle(request->getAttributes(i));
- rti1516::VariableLengthData
varData(&(request->getValues(i)[0]), request->getValues(i).size());
-
result->insert(std::pair<rti1516::AttributeHandle,rti1516::VariableLengthData>(attribute,
varData));
+ rti1516e::AttributeHandle attribute =
rti1516e::AttributeHandleFriend::createRTI1516Handle(request->getAttributes(i));
+ rti1516e::VariableLengthData
varData(&(request->getValues(i)[0]), request->getValues(i).size());
+
result->insert(std::pair<rti1516e::AttributeHandle,rti1516e::VariableLengthData>(attribute,
varData));
}
return result;
}
template<typename T>
-rti1516::ParameterHandleValueMap *
+rti1516e::ParameterHandleValueMap *
getPHVMFromRequest(T* request)
{
uint32_t size = request->getParametersSize();
- rti1516::ParameterHandleValueMap *result = new
rti1516::ParameterHandleValueMap();
+ rti1516e::ParameterHandleValueMap *result = new
rti1516e::ParameterHandleValueMap();
for (uint32_t i = 0 ; i < size ; ++i) {
- rti1516::ParameterHandle parameter =
rti1516::ParameterHandleFriend::createRTI1516Handle(request->getParameters(i));
- rti1516::VariableLengthData
varData(&(request->getValues(i)[0]), request->getValues(i).size());
-
result->insert(std::pair<rti1516::ParameterHandle,rti1516::VariableLengthData>(parameter,
varData));
+ rti1516e::ParameterHandle parameter =
rti1516e::ParameterHandleFriend::createRTI1516Handle(request->getParameters(i));
+ rti1516e::VariableLengthData
varData(&(request->getValues(i)[0]), request->getValues(i).size());
+
result->insert(std::pair<rti1516e::ParameterHandle,rti1516e::VariableLengthData>(parameter,
varData));
}
return result;
}
template<typename T>
-rti1516::AttributeHandleSet *
+rti1516e::AttributeHandleSet *
getAHSFromRequest(T* request)
{
uint32_t size = request->getAttributesSize();
- rti1516::AttributeHandleSet *result = new rti1516::AttributeHandleSet();
+ rti1516e::AttributeHandleSet *result = new
rti1516e::AttributeHandleSet();
for (uint32_t i = 0 ; i < size ; ++i) {
- rti1516::AttributeHandle attribute =
rti1516::AttributeHandleFriend::createRTI1516Handle(request->getAttributes(i));
+ rti1516e::AttributeHandle attribute =
rti1516e::AttributeHandleFriend::createRTI1516Handle(request->getAttributes(i));
result->insert(attribute);
}
return result;
}
-std::auto_ptr< rti1516::LogicalTime >
+std::auto_ptr< rti1516e::LogicalTime >
getLogicalTime()
-throw ( rti1516::RTIinternalError )
+throw ( rti1516e::RTIinternalError )
{
- std::auto_ptr< rti1516::LogicalTimeFactory > timeFactory =
rti1516::LogicalTimeFactoryFactory::makeLogicalTimeFactory(L"");
+ std::auto_ptr< rti1516e::LogicalTimeFactory > timeFactory =
rti1516e::LogicalTimeFactoryFactory::makeLogicalTimeFactory(L"");
if (timeFactory.get() != 0)
{
return timeFactory->makeLogicalTime();
} else
{
- throw rti1516::RTIinternalError(L"Could not create
LogicalTimeFactory");
+ throw rti1516e::RTIinternalError(L"Could not create
LogicalTimeFactory");
}
}
@@ -158,11 +158,11 @@
// ----------------------------------------------------------------------------
void
-RTI1516ambPrivateRefs::leave(const char *msg) throw (rti1516::RTIinternalError)
+RTI1516ambPrivateRefs::leave(const char *msg) throw
(rti1516e::RTIinternalError)
{
std::wstringstream smsg;
smsg << "RTI called leave because <" <<msg<<">";
- throw rti1516::RTIinternalError(smsg.str());
+ throw rti1516e::RTIinternalError(smsg.str());
}
// ----------------------------------------------------------------------------
@@ -184,7 +184,7 @@
return;
} else
{
- throw rti1516::RTIinternalError(L"libRTI: Network Write
Error");
+ throw rti1516e::RTIinternalError(L"libRTI: Network
Write Error");
}
}
@@ -196,7 +196,7 @@
}
catch (certi::NetworkError) {
std::cerr << "libRTI: exception: NetworkError (read)" <<
std::endl ;
- throw rti1516::RTIinternalError(L"libRTI: Network Read Error
waiting RTI reply");
+ throw rti1516e::RTIinternalError(L"libRTI: Network Read Error
waiting RTI reply");
}
D.Out(pdDebug, "RTIA reply received.");
@@ -204,7 +204,7 @@
if (rep->getMessageType() != req->getMessageType()) {
std::cout << "LibRTI: Assertion failed: rep->type != req->type"
<< std::endl ;
- throw
rti1516::RTIinternalError(L"RTI1516ambPrivateRefs::executeService: "
+ throw
rti1516e::RTIinternalError(L"RTI1516ambPrivateRefs::executeService: "
L"rep->type != req->type");
}
@@ -229,7 +229,7 @@
}
catch (certi::NetworkError) {
std::cerr << "libRTI: exception: NetworkError (write)" <<
std::endl ;
- throw rti1516::RTIinternalError(L"libRTI: Network Write Error");
+ throw rti1516e::RTIinternalError(L"libRTI: Network Write
Error");
}
try {
@@ -237,7 +237,7 @@
}
catch (certi::NetworkError) {
std::cerr << "libRTI: exception: NetworkError (read)" <<
std::endl ;
- throw rti1516::RTIinternalError(L"libRTI: Network Read Error
waiting RTI reply");
+ throw rti1516e::RTIinternalError(L"libRTI: Network Read Error
waiting RTI reply");
}
// ignore the response, ignore exceptions
@@ -262,168 +262,168 @@
case e_ArrayIndexOutOfBounds: {
D.Out(pdExcept, "Throwing e_ArrayIndexOutOfBounds exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_AsynchronousDeliveryAlreadyEnabled: {
D.Out(pdExcept, "Throwing e_AsynchronousDeliveryAlreadyEnabled
exception.");
- throw
rti1516::AsynchronousDeliveryAlreadyEnabled(msg->getExceptionReasonW());
+ throw
rti1516e::AsynchronousDeliveryAlreadyEnabled(msg->getExceptionReasonW());
} break ;
case e_AsynchronousDeliveryAlreadyDisabled: {
D.Out(pdExcept, "Throwing e_AsynchronousDeliveryAlreadyDisabled
exception.");
- throw
rti1516::AsynchronousDeliveryAlreadyDisabled(msg->getExceptionReasonW());
+ throw
rti1516e::AsynchronousDeliveryAlreadyDisabled(msg->getExceptionReasonW());
} break ;
case e_AttributeAlreadyOwned: {
D.Out(pdExcept, "Throwing e_AttributeAlreadyOwned exception.");
- throw
rti1516::AttributeAlreadyOwned(msg->getExceptionReasonW());
+ throw
rti1516e::AttributeAlreadyOwned(msg->getExceptionReasonW());
} break ;
case e_AttributeAlreadyBeingAcquired: {
D.Out(pdExcept,
"Throwing e_AttributeAlreadyBeingAcquired
exception.");
- throw
rti1516::AttributeAlreadyBeingAcquired(msg->getExceptionReasonW());
+ throw
rti1516e::AttributeAlreadyBeingAcquired(msg->getExceptionReasonW());
} break ;
case e_AttributeAlreadyBeingDivested: {
D.Out(pdExcept,
"Throwing e_AttributeAlreadyBeingDivested
exception.");
- throw
rti1516::AttributeAlreadyBeingDivested(msg->getExceptionReasonW());
+ throw
rti1516e::AttributeAlreadyBeingDivested(msg->getExceptionReasonW());
} break ;
case e_AttributeDivestitureWasNotRequested: {
D.Out(pdExcept,
"Throwing e_AttributeDivestitureWasNotRequested
exception.");
- throw
rti1516::AttributeDivestitureWasNotRequested(msg->getExceptionReasonW());
+ throw
rti1516e::AttributeDivestitureWasNotRequested(msg->getExceptionReasonW());
} break ;
case e_AttributeAcquisitionWasNotRequested: {
D.Out(pdExcept,
"Throwing e_AttributeAcquisitionWasNotRequested
exception.");
- throw
rti1516::AttributeAcquisitionWasNotRequested(msg->getExceptionReasonW());
+ throw
rti1516e::AttributeAcquisitionWasNotRequested(msg->getExceptionReasonW());
} break ;
case e_AttributeNotDefined: {
D.Out(pdExcept, "Throwing e_AttributeNotDefined exception.");
- throw rti1516::AttributeNotDefined(msg->getExceptionReasonW());
+ throw rti1516e::AttributeNotDefined(msg->getExceptionReasonW());
} break ;
case e_AttributeNotKnown: {
D.Out(pdExcept, "Throwing e_AttributeNotKnown exception.");
// JvY: Changed name of exception
- throw
rti1516::AttributeNotRecognized(msg->getExceptionReasonW());
+ throw
rti1516e::AttributeNotRecognized(msg->getExceptionReasonW());
} break ;
case e_AttributeNotOwned: {
D.Out(pdExcept, "Throwing e_AttributeNotOwned exception.");
- throw rti1516::AttributeNotOwned(msg->getExceptionReasonW());
+ throw rti1516e::AttributeNotOwned(msg->getExceptionReasonW());
} break ;
case e_AttributeNotPublished: {
D.Out(pdExcept, "Throwing e_AttributeNotPublished exception.");
- throw
rti1516::AttributeNotPublished(msg->getExceptionReasonW());
+ throw
rti1516e::AttributeNotPublished(msg->getExceptionReasonW());
} break ;
case e_AttributeNotSubscribed: {
D.Out(pdExcept, "Throwing e_AttributeNotSubscribed exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_ConcurrentAccessAttempted: {
D.Out(pdExcept, "Throwing e_ConcurrentAccessAttempted
exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_CouldNotDiscover: {
D.Out(pdExcept, "Throwing e_CouldNotDiscover exception.");
- throw rti1516::CouldNotDiscover(msg->getExceptionReasonW());
+ throw rti1516e::CouldNotDiscover(msg->getExceptionReasonW());
} break ;
case e_CouldNotOpenFED: {
D.Out(pdExcept, "Throwing e_CouldNotOpenFED exception.");
// JvY: Changed name of exception
- throw rti1516::CouldNotOpenFDD(msg->getExceptionReasonW());
+ throw rti1516e::CouldNotOpenFDD(msg->getExceptionReasonW());
} break ;
case e_CouldNotOpenRID: {
D.Out(pdExcept, "Throwing e_CouldNotOpenRID exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_CouldNotRestore: {
D.Out(pdExcept, "Throwing e_CouldNotRestore exception.");
// JvY: Changed name of exception
- throw
rti1516::CouldNotInitiateRestore(msg->getExceptionReasonW());
+ throw
rti1516e::CouldNotInitiateRestore(msg->getExceptionReasonW());
} break ;
case e_DeletePrivilegeNotHeld: {
D.Out(pdExcept, "Throwing e_DeletePrivilegeNotHeld exception.");
- throw
rti1516::DeletePrivilegeNotHeld(msg->getExceptionReasonW());
+ throw
rti1516e::DeletePrivilegeNotHeld(msg->getExceptionReasonW());
} break ;
case e_ErrorReadingRID: {
D.Out(pdExcept, "Throwing e_ErrorReadingRID exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_ErrorReadingFED: {
D.Out(pdExcept, "Throwing e_ErrorReadingFED exception.");
// JvY: Changed name of exception
- throw rti1516::ErrorReadingFDD(msg->getExceptionReasonW());
+ throw rti1516e::ErrorReadingFDD(msg->getExceptionReasonW());
} break ;
case e_EventNotKnown: {
D.Out(pdExcept, "Throwing e_EventNotKnown exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_FederateAlreadyPaused: {
D.Out(pdExcept, "Throwing e_FederateAlreadyPaused exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_FederateAlreadyExecutionMember: {
D.Out(pdExcept,
"Throwing e_FederateAlreadyExecutionMember
exception.");
- throw
rti1516::FederateAlreadyExecutionMember(msg->getExceptionReasonW());
+ throw
rti1516e::FederateAlreadyExecutionMember(msg->getExceptionReasonW());
} break ;
case e_FederateDoesNotExist: {
D.Out(pdExcept, "Throwing e_FederateDoesNotExist exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_FederateInternalError: {
D.Out(pdExcept, "Throwing e_FederateInternalError exception.");
- throw
rti1516::FederateInternalError(msg->getExceptionReasonW());
+ throw
rti1516e::FederateInternalError(msg->getExceptionReasonW());
} break ;
case e_FederateNameAlreadyInUse: {
D.Out(pdExcept, "Throwing e_FederateNameAlreadyInUse
exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_FederateNotExecutionMember: {
D.Out(pdExcept, "Throwing e_FederateNotExecutionMember
exception.");
- throw
rti1516::FederateNotExecutionMember(msg->getExceptionReasonW());
+ throw
rti1516e::FederateNotExecutionMember(msg->getExceptionReasonW());
} break ;
case e_FederateNotPaused: {
D.Out(pdExcept, "Throwing e_FederateNotPaused exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_FederateOwnsAttributes: {
D.Out(pdExcept, "Throwing e_FederateOwnsAttributes exception.");
- throw
rti1516::FederateOwnsAttributes(msg->getExceptionReasonW());
+ throw
rti1516e::FederateOwnsAttributes(msg->getExceptionReasonW());
} break ;
case e_FederatesCurrentlyJoined: {
D.Out(pdExcept, "Throwing e_FederatesCurrentlyJoined
exception.");
- throw
rti1516::FederatesCurrentlyJoined(msg->getExceptionReasonW());
+ throw
rti1516e::FederatesCurrentlyJoined(msg->getExceptionReasonW());
} break ;
case e_FederateWasNotAskedToReleaseAttribute: {
@@ -432,308 +432,308 @@
D.Out(pdDebug,
"Throwing
e_FederateWasNotAskedToReleaseAttribute exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_FederationAlreadyPaused: {
D.Out(pdExcept, "Throwing e_FederationAlreadyPaused
exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_FederationExecutionAlreadyExists: {
D.Out(pdExcept, "Throwing e_FederationExecutionAlreadyExists
excep.");
- throw
rti1516::FederationExecutionAlreadyExists(msg->getExceptionReasonW());
+ throw
rti1516e::FederationExecutionAlreadyExists(msg->getExceptionReasonW());
} break ;
case e_FederationExecutionDoesNotExist: {
D.Out(pdExcept, "Throwing e_FederationExecutionDoesNotExist
except.");
- throw
rti1516::FederationExecutionDoesNotExist(msg->getExceptionReasonW());
+ throw
rti1516e::FederationExecutionDoesNotExist(msg->getExceptionReasonW());
} break ;
case e_FederationNotPaused: {
D.Out(pdExcept, "Throwing e_FederationNotPaused exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_FederationTimeAlreadyPassed: {
D.Out(pdExcept, "Throwing e_FederationTimeAlreadyPassed
exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_FederateNotPublishing: {
D.Out(pdExcept, "Throwing e_FederateNotPublishing exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_FederateNotSubscribing: {
D.Out(pdExcept, "Throwing e_FederateNotSubscribing exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_RegionNotKnown: {
D.Out(pdExcept, "Throwing e_RegionNotKnown exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_IDsupplyExhausted: {
D.Out(pdExcept, "Throwing e_IDsupplyExhausted exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_InteractionClassNotDefined: {
D.Out(pdExcept, "Throwing e_InteractionClassNotDefined
exception.");
- throw
rti1516::InteractionClassNotDefined(msg->getExceptionReasonW());
+ throw
rti1516e::InteractionClassNotDefined(msg->getExceptionReasonW());
} break ;
case e_InteractionClassNotKnown: {
D.Out(pdExcept, "Throwing e_InteractionClassNotKnown
exception.");
// JvY: Changed name of exception
- throw
rti1516::InteractionClassNotRecognized(msg->getExceptionReasonW());
+ throw
rti1516e::InteractionClassNotRecognized(msg->getExceptionReasonW());
} break ;
case e_InteractionClassNotPublished: {
D.Out(pdExcept, "Throwing e_InteractionClassNotPublished
exception.");
- throw
rti1516::InteractionClassNotPublished(msg->getExceptionReasonW());
+ throw
rti1516e::InteractionClassNotPublished(msg->getExceptionReasonW());
} break ;
case e_InteractionParameterNotDefined: {
D.Out(pdExcept,
"Throwing e_InteractionParameterNotDefined
exception.");
- throw
rti1516::InteractionParameterNotDefined(msg->getExceptionReasonW());
+ throw
rti1516e::InteractionParameterNotDefined(msg->getExceptionReasonW());
} break ;
case e_InteractionParameterNotKnown: {
D.Out(pdExcept, "Throwing e_InteractionParameterNotKnown
exception.");
// JvY: Changed name of exception
- throw
rti1516::InteractionParameterNotRecognized(msg->getExceptionReasonW());
+ throw
rti1516e::InteractionParameterNotRecognized(msg->getExceptionReasonW());
} break ;
case e_InvalidDivestitureCondition: {
D.Out(pdExcept, "Throwing e_InvalidDivestitureCondition
exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_InvalidExtents: {
D.Out(pdExcept, "Throwing e_InvalidExtents exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_InvalidFederationTime: {
D.Out(pdExcept, "Throwing e_InvalidFederationTime exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_InvalidFederationTimeDelta: {
D.Out(pdExcept, "Throwing e_InvalidFederationTimeDelta
exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_InvalidLookahead: {
D.Out(pdExcept, "Throwing e_InvalidLookahead.");
- throw rti1516::InvalidLookahead(msg->getExceptionReasonW());
+ throw rti1516e::InvalidLookahead(msg->getExceptionReasonW());
} break ;
case e_InvalidObjectHandle: {
D.Out(pdExcept, "Throwing e_InvalidObjectHandle exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_InvalidOrderingHandle: {
D.Out(pdExcept, "Throwing e_InvalidOrderingHandle exception.");
// JvY: Changed name of exception
- throw rti1516::InvalidOrderType(msg->getExceptionReasonW());
+ throw rti1516e::InvalidOrderType(msg->getExceptionReasonW());
} break ;
case e_InvalidResignAction: {
D.Out(pdExcept, "Throwing e_InvalidResignAction exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_InvalidRetractionHandle: {
D.Out(pdExcept, "Throwing e_InvalidRetractionHandle
exception.");
- throw
rti1516::InvalidRetractionHandle(msg->getExceptionReasonW());
+ throw
rti1516e::InvalidMessageRetractionHandle(msg->getExceptionReasonW());
} break ;
case e_InvalidRoutingSpace: {
D.Out(pdExcept, "Throwing e_InvalidRoutingSpace exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_InvalidTransportationHandle: {
D.Out(pdExcept, "Throwing e_InvalidTransportationHandle
exception.");
// JvY: Changed name of exception
- throw
rti1516::InvalidTransportationType(msg->getExceptionReasonW());
+ throw
rti1516e::InvalidTransportationType(msg->getExceptionReasonW());
} break ;
case e_MemoryExhausted: {
D.Out(pdExcept, "Throwing e_MemoryExhausted exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_NameNotFound: {
D.Out(pdExcept, "Throwing e_NameNotFound exception.");
- throw rti1516::NameNotFound(msg->getExceptionReasonW());
+ throw rti1516e::NameNotFound(msg->getExceptionReasonW());
} break ;
case e_NoPauseRequested: {
D.Out(pdExcept, "Throwing e_NoPauseRequested exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_NoResumeRequested: {
D.Out(pdExcept, "Throwing e_NoResumeRequested exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_ObjectClassNotDefined: {
D.Out(pdExcept, "Throwing e_ObjectClassNotDefined exception.");
- throw
rti1516::ObjectClassNotDefined(msg->getExceptionReasonW());
+ throw
rti1516e::ObjectClassNotDefined(msg->getExceptionReasonW());
} break ;
case e_ObjectClassNotKnown: {
D.Out(pdExcept, "Throwing e_ObjectClassNotKnown exception.");
- throw rti1516::ObjectClassNotKnown(msg->getExceptionReasonW());
+ throw rti1516e::ObjectClassNotKnown(msg->getExceptionReasonW());
} break ;
case e_ObjectClassNotPublished: {
D.Out(pdExcept, "Throwing e_ObjectClassNotPublished
exception.");
- throw
rti1516::ObjectClassNotPublished(msg->getExceptionReasonW());
+ throw
rti1516e::ObjectClassNotPublished(msg->getExceptionReasonW());
} break ;
case e_ObjectClassNotSubscribed: {
D.Out(pdExcept, "Throwing e_ObjectClassNotSubscribed
exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_ObjectNotKnown: {
D.Out(pdExcept, "Throwing e_ObjectNotKnown exception.");
// JvY: Changed name of exception
- throw
rti1516::ObjectInstanceNotKnown(msg->getExceptionReasonW());
+ throw
rti1516e::ObjectInstanceNotKnown(msg->getExceptionReasonW());
} break ;
case e_ObjectAlreadyRegistered: {
D.Out(pdExcept, "Throwing e_ObjectAlreadyRegistered
exception.");
// JvY: Changed name of exception
- throw
rti1516::ObjectInstanceNameInUse(msg->getExceptionReasonW());
+ throw
rti1516e::ObjectInstanceNameInUse(msg->getExceptionReasonW());
} break ;
case e_RestoreInProgress: {
D.Out(pdExcept, "Throwing e_RestoreInProgress exception.");
- throw rti1516::RestoreInProgress(msg->getExceptionReasonW());
+ throw rti1516e::RestoreInProgress(msg->getExceptionReasonW());
} break ;
case e_RestoreNotRequested: {
D.Out(pdExcept, "Throwing e_RestoreNotRequested exception.");
- throw rti1516::RestoreNotRequested(msg->getExceptionReasonW());
+ throw rti1516e::RestoreNotRequested(msg->getExceptionReasonW());
} break ;
case e_RTIinternalError: {
D.Out(pdExcept, "Throwing e_RTIinternalError exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_SpaceNotDefined: {
D.Out(pdExcept, "Throwing e_SpaceNotDefined exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_SaveInProgress: {
D.Out(pdExcept, "Throwing e_SaveInProgress exception.");
- throw rti1516::SaveInProgress(msg->getExceptionReasonW());
+ throw rti1516e::SaveInProgress(msg->getExceptionReasonW());
} break ;
case e_SaveNotInitiated: {
D.Out(pdExcept, "Throwing e_SaveNotInitiated exception.");
- throw rti1516::SaveNotInitiated(msg->getExceptionReasonW());
+ throw rti1516e::SaveNotInitiated(msg->getExceptionReasonW());
} break ;
case e_SecurityError: {
D.Out(pdExcept, "Throwing e_SecurityError exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_SpecifiedSaveLabelDoesNotExist: {
D.Out(pdExcept,
"Throwing e_SpecifiedSaveLabelDoesNotExist
exception.");
- throw
rti1516::SpecifiedSaveLabelDoesNotExist(msg->getExceptionReasonW());
+ throw
rti1516e::SpecifiedSaveLabelDoesNotExist(msg->getExceptionReasonW());
} break ;
case e_TimeAdvanceAlreadyInProgress: {
D.Out(pdExcept, "Throwing e_TimeAdvanceAlreadyInProgress
exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_TimeAdvanceWasNotInProgress: {
D.Out(pdExcept, "Throwing e_TimeAdvanceWasNotInProgress
exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_TooManyIDsRequested: {
D.Out(pdExcept, "Throwing e_TooManyIDsRequested exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_UnableToPerformSave: {
D.Out(pdExcept, "Throwing e_UnableToPerformSave exception.");
- throw rti1516::UnableToPerformSave(msg->getExceptionReasonW());
+ throw rti1516e::UnableToPerformSave(msg->getExceptionReasonW());
} break ;
case e_UnimplementedService: {
D.Out(pdExcept, "Throwing e_UnimplementedService exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_UnknownLabel: {
D.Out(pdExcept, "Throwing e_UnknownLabel exception.");
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_ValueCountExceeded: {
D.Out(pdExcept, "Throwing e_ValueCountExceeded exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_ValueLengthExceeded: {
D.Out(pdExcept, "Throwing e_ValueLengthExceeded exception.");
// JvY: Changed name of exception
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
case e_IllegalName: {
D.Out(pdExcept, "Throwing e_IllegalName exception.");
- throw rti1516::IllegalName(msg->getExceptionReasonW());
+ throw rti1516e::IllegalName(msg->getExceptionReasonW());
} break;
default: {
D.Out(pdExcept, "Throwing unknown exception !");
std::cout << "LibRTI: Receiving unknown RTI exception." <<
std::endl;
- throw rti1516::RTIinternalError(msg->getExceptionReasonW());
+ throw rti1516e::RTIinternalError(msg->getExceptionReasonW());
} break ;
}
}
#define CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(service) \
- catch (rti1516::Exception &e) { \
+ catch (rti1516e::Exception &e) { \
std::wstringstream msg; \
msg << "Error in " << service << ": " << e.what(); \
- throw rti1516::RTIinternalError(msg.str()); \
+ throw rti1516e::RTIinternalError(msg.str()); \
}
void
RTI1516ambPrivateRefs::callFederateAmbassador(Message *msg)
-throw (rti1516::RTIinternalError)
+throw (rti1516e::RTIinternalError)
{
switch (msg->getMessageType()) {
@@ -746,7 +746,7 @@
case Message::SYNCHRONIZATION_POINT_REGISTRATION_FAILED:
try {
-
fed_amb->synchronizationPointRegistrationFailed(msg->getLabelW(),
rti1516::RTI_DETECTED_FAILURE_DURING_SYNCHRONIZATION);
+
fed_amb->synchronizationPointRegistrationFailed(msg->getLabelW(),
rti1516e::SYNCHRONIZATION_SET_MEMBER_NOT_JOINED);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"synchronizationPointRegistrationFailed")
break ;
@@ -754,7 +754,7 @@
case Message::ANNOUNCE_SYNCHRONIZATION_POINT:
try {
std::string tagString(msg->getTag());
- rti1516::VariableLengthData
tagVarData(tagString.c_str(), tagString.length());
+ rti1516e::VariableLengthData
tagVarData(tagString.c_str(), tagString.length());
fed_amb->announceSynchronizationPoint(msg->getLabelW(),tagVarData);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"announceSynchronizationPoint")
@@ -762,7 +762,9 @@
case Message::FEDERATION_SYNCHRONIZED:
try {
- fed_amb->federationSynchronized(msg->getLabelW());
+ /* FIXME: how to setup the FHS content */
+ rti1516e::FederateHandleSet fhs;
+ fed_amb->federationSynchronized(msg->getLabelW(),fhs);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"federationSynchronized")
break ;
@@ -806,8 +808,9 @@
case Message::INITIATE_FEDERATE_RESTORE:
try {
M_Initiate_Federate_Restore *IFR =
static_cast<M_Initiate_Federate_Restore *>(msg);
- rti1516::FederateHandle rti1516Handle =
rti1516::FederateHandleFriend::createRTI1516Handle(IFR->getFederate());
- fed_amb->initiateFederateRestore((IFR->getLabelW()),
rti1516Handle);
+ rti1516e::FederateHandle rti1516Handle =
rti1516e::FederateHandleFriend::createRTI1516Handle(IFR->getFederate());
+ /* FIXME how to setup federateName (2nd) argument) */
+ fed_amb->initiateFederateRestore((IFR->getLabelW()),
L"NoFederateName",rti1516Handle);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"initiateFederateRestore")
break ;
@@ -822,14 +825,14 @@
case Message::FEDERATION_NOT_RESTORED:
try {
// TODO Need to know reason
-
fed_amb->federationNotRestored(rti1516::RTI_UNABLE_TO_RESTORE);
+
fed_amb->federationNotRestored(rti1516e::RTI_UNABLE_TO_RESTORE);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"federationNotRestored")
break ;
case Message::START_REGISTRATION_FOR_OBJECT_CLASS:
try {
- rti1516::ObjectClassHandle rti1516Handle =
rti1516::ObjectClassHandleFriend::createRTI1516Handle(static_cast<M_Start_Registration_For_Object_Class
*>(msg)->getObjectClass());
+ rti1516e::ObjectClassHandle rti1516Handle =
rti1516e::ObjectClassHandleFriend::createRTI1516Handle(static_cast<M_Start_Registration_For_Object_Class
*>(msg)->getObjectClass());
fed_amb->startRegistrationForObjectClass(rti1516Handle);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"startRegistrationForObjectClass")
@@ -837,7 +840,7 @@
case Message::STOP_REGISTRATION_FOR_OBJECT_CLASS:
try {
- rti1516::ObjectClassHandle rti1516Handle =
rti1516::ObjectClassHandleFriend::createRTI1516Handle(static_cast<M_Stop_Registration_For_Object_Class
*>(msg)->getObjectClass());
+ rti1516e::ObjectClassHandle rti1516Handle =
rti1516e::ObjectClassHandleFriend::createRTI1516Handle(static_cast<M_Stop_Registration_For_Object_Class
*>(msg)->getObjectClass());
fed_amb->stopRegistrationForObjectClass(rti1516Handle);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"stopRegistrationForObjectClass")
@@ -845,7 +848,7 @@
case Message::TURN_INTERACTIONS_ON:
try {
- rti1516::InteractionClassHandle rti1516Handle =
rti1516::InteractionClassHandleFriend::createRTI1516Handle(static_cast<M_Turn_Interactions_On
*>(msg)->getInteractionClass());
+ rti1516e::InteractionClassHandle rti1516Handle =
rti1516e::InteractionClassHandleFriend::createRTI1516Handle(static_cast<M_Turn_Interactions_On
*>(msg)->getInteractionClass());
fed_amb->turnInteractionsOn(rti1516Handle);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"turnInteractionsOn")
@@ -853,7 +856,7 @@
case Message::TURN_INTERACTIONS_OFF:
try {
- rti1516::InteractionClassHandle rti1516Handle =
rti1516::InteractionClassHandleFriend::createRTI1516Handle(static_cast<M_Turn_Interactions_Off
*>(msg)->getInteractionClass());
+ rti1516e::InteractionClassHandle rti1516Handle =
rti1516e::InteractionClassHandleFriend::createRTI1516Handle(static_cast<M_Turn_Interactions_Off
*>(msg)->getInteractionClass());
fed_amb->turnInteractionsOff(rti1516Handle);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"turnInteractionsOff")
@@ -862,8 +865,8 @@
case Message::DISCOVER_OBJECT_INSTANCE:
try {
M_Discover_Object_Instance* DOI =
static_cast<M_Discover_Object_Instance *>(msg);
- rti1516::ObjectInstanceHandle objectInstance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(DOI->getObject());
- rti1516::ObjectClassHandle objectClass =
rti1516::ObjectClassHandleFriend::createRTI1516Handle(DOI->getObjectClass());
+ rti1516e::ObjectInstanceHandle objectInstance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(DOI->getObject());
+ rti1516e::ObjectClassHandle objectClass =
rti1516e::ObjectClassHandleFriend::createRTI1516Handle(DOI->getObjectClass());
std::string str = DOI->getObjectName();
std::wstring str2(str.length(), L' '); // Make room for
characters
// Copy string to wstring.
@@ -881,36 +884,40 @@
M_Reflect_Attribute_Values* RAV =
static_cast<M_Reflect_Attribute_Values *>(msg);
G.Out(pdGendoc," tick_kernel call to
reflectAttributeValues");
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(RAV->getObject());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(RAV->getObject());
- rti1516::AttributeHandleValueMap *attributes =
getAHVMFromRequest(RAV);
+ rti1516e::AttributeHandleValueMap *attributes =
getAHVMFromRequest(RAV);
std::string tagString(msg->getTag());
- rti1516::VariableLengthData
tagVarData(tagString.c_str(), tagString.length());
+ rti1516e::VariableLengthData
tagVarData(tagString.c_str(), tagString.length());
+ /* FIXME 1516-2010: Howto setup SRI properly ?? */
+ rti1516e::SupplementalReflectInfo sri;
if (msg->isDated()) {
uint64_t sn = RAV->getEventRetraction().getSN();
certi::FederateHandle certiHandle =
RAV->getEventRetraction().getSendingFederate();
- rti1516::MessageRetractionHandle event =
rti1516::MessageRetractionHandleFriend::createRTI1516Handle(certiHandle, sn);
+ rti1516e::MessageRetractionHandle event =
rti1516e::MessageRetractionHandleFriend::createRTI1516Handle(certiHandle, sn);
+
+ std::auto_ptr < rti1516e::LogicalTime > fedTime
(new RTI1516fedTime(msg->getDate().getTime()));
- std::auto_ptr < rti1516::LogicalTime > fedTime
(new RTI1516fedTime(msg->getDate().getTime()));
fed_amb->reflectAttributeValues(instance,
//ObjectInstanceHandle
*attributes,
//AttributeHandleValueMap &
tagVarData,
//VariableLengthData &
- rti1516::TIMESTAMP,
//OrderType (send)
- rti1516::RELIABLE,
//TransportationType
+ rti1516e::TIMESTAMP,
//OrderType (send)
+ rti1516e::RELIABLE,
//TransportationType
*fedTime,
//LogicalTime &
- rti1516::RECEIVE,
//OrderType (receive)
- event
//MessageRetractionHandle
- );
+ rti1516e::RECEIVE,
//OrderType (receive)
+ event,
//MessageRetractionHandle
+ sri);
}
else {
fed_amb->reflectAttributeValues(instance,
*attributes,
tagVarData,
- rti1516::RECEIVE,
- rti1516::RELIABLE);
+ rti1516e::RECEIVE,
+ rti1516e::RELIABLE,
+ sri);
}
delete attributes ;
}
@@ -920,38 +927,41 @@
case Message::RECEIVE_INTERACTION:
try {
M_Receive_Interaction* RI =
static_cast<M_Receive_Interaction *>(msg);
- rti1516::ParameterHandleValueMap *parameters =
getPHVMFromRequest(RI);
+ rti1516e::ParameterHandleValueMap *parameters =
getPHVMFromRequest(RI);
- rti1516::InteractionClassHandle interactionHandle =
rti1516::InteractionClassHandleFriend::createRTI1516Handle(RI->getInteractionClass());
+ rti1516e::InteractionClassHandle interactionHandle =
rti1516e::InteractionClassHandleFriend::createRTI1516Handle(RI->getInteractionClass());
std::string tagString(msg->getTag());
- rti1516::VariableLengthData
tagVarData(tagString.c_str(), tagString.length());
+ rti1516e::VariableLengthData
tagVarData(tagString.c_str(), tagString.length());
+ /* FIXME 1516-2010: Howto setup SRI properly ?? */
+ rti1516e::SupplementalReceiveInfo sri;
if (msg->isDated()) {
uint64_t sn = RI->getEventRetraction().getSN();
certi::FederateHandle certiHandle =
RI->getEventRetraction().getSendingFederate();
- rti1516::MessageRetractionHandle event =
rti1516::MessageRetractionHandleFriend::createRTI1516Handle(certiHandle, sn);
+ rti1516e::MessageRetractionHandle event =
rti1516e::MessageRetractionHandleFriend::createRTI1516Handle(certiHandle, sn);
- std::auto_ptr < rti1516::LogicalTime > fedTime
(new RTI1516fedTime(msg->getDate().getTime()));
+ std::auto_ptr < rti1516e::LogicalTime > fedTime
(new RTI1516fedTime(msg->getDate().getTime()));
fed_amb->receiveInteraction(
interactionHandle,
// InteractionClassHandle
*parameters,
// ParameterHandleValueMap &
tagVarData,
// VariableLengthData &
- rti1516::TIMESTAMP,
//OrderType (send)
- rti1516::RELIABLE,
//TransportationType
+ rti1516e::TIMESTAMP,
//OrderType (send)
+ rti1516e::RELIABLE,
//TransportationType
*fedTime,
//LogicalTime &
- rti1516::RECEIVE,
//OrderType (receive)
- event
//MessageRetractionHandle
- );
+ rti1516e::RECEIVE,
//OrderType (receive)
+ event,
//MessageRetractionHandle
+ sri);
}
else {
fed_amb->receiveInteraction(
interactionHandle,
*parameters,
tagVarData,
- rti1516::RECEIVE,
- rti1516::RELIABLE);
+ rti1516e::RECEIVE,
+ rti1516e::RELIABLE,
+ sri);
}
delete parameters ;
}
@@ -962,31 +972,35 @@
try {
M_Remove_Object_Instance* ROI =
static_cast<M_Remove_Object_Instance *>(msg);
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(ROI->getObject());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(ROI->getObject());
std::string tagString(msg->getTag());
- rti1516::VariableLengthData
tagVarData(tagString.c_str(), tagString.length());
+ rti1516e::VariableLengthData
tagVarData(tagString.c_str(), tagString.length());
+ /* FIXME 1516-2010: Howto setup SRI properly ?? */
+ rti1516e::SupplementalRemoveInfo sri;
if (msg->isDated()) {
uint64_t sn = ROI->getEventRetraction().getSN();
certi::FederateHandle certiHandle =
ROI->getEventRetraction().getSendingFederate();
- rti1516::MessageRetractionHandle event =
rti1516::MessageRetractionHandleFriend::createRTI1516Handle(certiHandle, sn);
+ rti1516e::MessageRetractionHandle event =
rti1516e::MessageRetractionHandleFriend::createRTI1516Handle(certiHandle, sn);
- std::auto_ptr < rti1516::LogicalTime > fedTime
(new RTI1516fedTime(msg->getDate().getTime()));
+ std::auto_ptr < rti1516e::LogicalTime > fedTime
(new RTI1516fedTime(msg->getDate().getTime()));
fed_amb->removeObjectInstance(
instance,
tagVarData,
- rti1516::TIMESTAMP,
+ rti1516e::TIMESTAMP,
*fedTime,
- rti1516::RECEIVE,
- event);
+ rti1516e::RECEIVE,
+ event,
+ sri);
}
else {
fed_amb->removeObjectInstance(
instance,
tagVarData,
- rti1516::RECEIVE);
+ rti1516e::RECEIVE,
+ sri);
}
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"removeObjectInstance")
@@ -996,12 +1010,12 @@
try {
M_Provide_Attribute_Value_Update* PAVU =
static_cast<M_Provide_Attribute_Value_Update *>(msg);
- rti1516::AttributeHandleSet *attributeSet =
getAHSFromRequest(PAVU);
+ rti1516e::AttributeHandleSet *attributeSet =
getAHSFromRequest(PAVU);
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(PAVU->getObject());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(PAVU->getObject());
std::string tag = PAVU->getTag();
- rti1516::VariableLengthData tagVarData(tag.c_str(),
tag.size());
+ rti1516e::VariableLengthData tagVarData(tag.c_str(),
tag.size());
fed_amb->provideAttributeValueUpdate(instance,*attributeSet, tagVarData);
delete attributeSet ;
@@ -1016,12 +1030,12 @@
case Message::REQUEST_ATTRIBUTE_OWNERSHIP_ASSUMPTION:
try {
M_Request_Attribute_Ownership_Assumption* RAOA =
static_cast<M_Request_Attribute_Ownership_Assumption *>(msg);
- rti1516::AttributeHandleSet *attributeSet =
getAHSFromRequest(RAOA);
+ rti1516e::AttributeHandleSet *attributeSet =
getAHSFromRequest(RAOA);
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(RAOA->getObject());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(RAOA->getObject());
std::string tag = RAOA->getTag();
- rti1516::VariableLengthData tagVarData(tag.c_str(),
tag.size());
+ rti1516e::VariableLengthData tagVarData(tag.c_str(),
tag.size());
fed_amb->
requestAttributeOwnershipAssumption(instance,
@@ -1035,12 +1049,12 @@
case Message::REQUEST_ATTRIBUTE_OWNERSHIP_RELEASE:
try {
M_Request_Attribute_Ownership_Release* RAOR =
static_cast<M_Request_Attribute_Ownership_Release *>(msg);
- rti1516::AttributeHandleSet *attributeSet =
getAHSFromRequest(RAOR);
+ rti1516e::AttributeHandleSet *attributeSet =
getAHSFromRequest(RAOR);
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(RAOR->getObject());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(RAOR->getObject());
std::string tag = RAOR->getTag();
- rti1516::VariableLengthData tagVarData(tag.c_str(),
tag.size());
+ rti1516e::VariableLengthData tagVarData(tag.c_str(),
tag.size());
fed_amb->requestAttributeOwnershipRelease(
instance,
@@ -1056,9 +1070,9 @@
try {
M_Attribute_Ownership_Unavailable* AOU =
static_cast<M_Attribute_Ownership_Unavailable *>(msg);
- rti1516::AttributeHandleSet *attributeSet =
getAHSFromRequest(AOU);
+ rti1516e::AttributeHandleSet *attributeSet =
getAHSFromRequest(AOU);
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(AOU->getObject());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(AOU->getObject());
fed_amb->attributeOwnershipUnavailable(instance,
*attributeSet);
@@ -1072,12 +1086,12 @@
try {
M_Attribute_Ownership_Acquisition_Notification* AOAN =
static_cast<M_Attribute_Ownership_Acquisition_Notification *>(msg);
- rti1516::AttributeHandleSet *attributeSet =
getAHSFromRequest(AOAN);
+ rti1516e::AttributeHandleSet *attributeSet =
getAHSFromRequest(AOAN);
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(AOAN->getObject());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(AOAN->getObject());
std::string tag = AOAN->getTag();
- rti1516::VariableLengthData tagVarData(tag.c_str(),
tag.size());
+ rti1516e::VariableLengthData tagVarData(tag.c_str(),
tag.size());
fed_amb->attributeOwnershipAcquisitionNotification(
instance,
@@ -1093,9 +1107,9 @@
try {
M_Attribute_Ownership_Divestiture_Notification* AODN =
static_cast<M_Attribute_Ownership_Divestiture_Notification *>(msg);
- rti1516::AttributeHandleSet *attributeSet =
getAHSFromRequest(AODN);
+ rti1516e::AttributeHandleSet *attributeSet =
getAHSFromRequest(AODN);
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(AODN->getObject());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(AODN->getObject());
// requestDivestitureConfirmation = 7.5, en zou
ontbreken in 1.3. JRE: klopt dit wel?
// Changed function name! Originally:
attributeOwnershipDivestitureNotification
@@ -1112,9 +1126,9 @@
try {
M_Confirm_Attribute_Ownership_Acquisition_Cancellation*
CAOAC = static_cast<M_Confirm_Attribute_Ownership_Acquisition_Cancellation
*>(msg);
- rti1516::AttributeHandleSet *attributeSet =
getAHSFromRequest(CAOAC);
+ rti1516e::AttributeHandleSet *attributeSet =
getAHSFromRequest(CAOAC);
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(CAOAC->getObject());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(CAOAC->getObject());
fed_amb->confirmAttributeOwnershipAcquisitionCancellation(
instance,
@@ -1128,9 +1142,9 @@
case Message::INFORM_ATTRIBUTE_OWNERSHIP:
try {
M_Inform_Attribute_Ownership* IAO =
static_cast<M_Inform_Attribute_Ownership *>(msg);
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(IAO->getObject());
- rti1516::AttributeHandle attribute =
rti1516::AttributeHandleFriend::createRTI1516Handle(IAO->getAttribute());
- rti1516::FederateHandle federate =
rti1516::FederateHandleFriend::createRTI1516Handle(IAO->getFederate());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(IAO->getObject());
+ rti1516e::AttributeHandle attribute =
rti1516e::AttributeHandleFriend::createRTI1516Handle(IAO->getAttribute());
+ rti1516e::FederateHandle federate =
rti1516e::FederateHandleFriend::createRTI1516Handle(IAO->getFederate());
fed_amb->
informAttributeOwnership(
@@ -1144,8 +1158,8 @@
case Message::ATTRIBUTE_IS_NOT_OWNED:
try {
M_Attribute_Is_Not_Owned* AINO =
static_cast<M_Attribute_Is_Not_Owned *>(msg);
- rti1516::ObjectInstanceHandle instance =
rti1516::ObjectInstanceHandleFriend::createRTI1516Handle(AINO->getObject());
- rti1516::AttributeHandle attribute =
rti1516::AttributeHandleFriend::createRTI1516Handle(AINO->getAttribute());
+ rti1516e::ObjectInstanceHandle instance =
rti1516e::ObjectInstanceHandleFriend::createRTI1516Handle(AINO->getObject());
+ rti1516e::AttributeHandle attribute =
rti1516e::AttributeHandleFriend::createRTI1516Handle(AINO->getAttribute());
fed_amb->attributeIsNotOwned(
instance,
@@ -1163,7 +1177,7 @@
case Message::TIME_REGULATION_ENABLED:
try {
- std::auto_ptr < rti1516::LogicalTime > fedTime (new
RTI1516fedTime(msg->getDate().getTime()));
+ std::auto_ptr < rti1516e::LogicalTime > fedTime (new
RTI1516fedTime(msg->getDate().getTime()));
fed_amb->timeRegulationEnabled(*fedTime);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"timeRegulationEnabled")
@@ -1171,7 +1185,7 @@
case Message::TIME_CONSTRAINED_ENABLED:
try {
- std::auto_ptr < rti1516::LogicalTime > fedTime (new
RTI1516fedTime(msg->getDate().getTime()));
+ std::auto_ptr < rti1516e::LogicalTime > fedTime (new
RTI1516fedTime(msg->getDate().getTime()));
fed_amb->timeConstrainedEnabled(*fedTime);
}
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"timeConstrainedEnabled")
@@ -1204,4 +1218,4 @@
}
}
-// $Id: RTIambPrivateRefs.cpp,v 1.1 2014/03/06 16:11:32 erk Exp $
+// $Id: RTIambPrivateRefs.cpp,v 1.2 2014/03/07 18:00:49 erk Exp $
Index: libRTI/ieee1516-2010/HandleImplementation.h
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/HandleImplementation.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/ieee1516-2010/HandleImplementation.h 3 Mar 2014 16:43:26 -0000
1.1
+++ libRTI/ieee1516-2010/HandleImplementation.h 7 Mar 2014 18:00:49 -0000
1.2
@@ -114,7 +114,7 @@
};
\
-namespace rti1516
+namespace rti1516e
{
// All of the RTI API's Handle classes are defined
Index: libRTI/ieee1516-2010/Handle.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/Handle.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/ieee1516-2010/Handle.cpp 3 Mar 2014 16:43:26 -0000 1.1
+++ libRTI/ieee1516-2010/Handle.cpp 7 Mar 2014 18:00:49 -0000 1.2
@@ -23,6 +23,7 @@
#include <sstream>
#include <RTI/Handle.h>
#include "HandleImplementation.h"
+#include "RTIvariableLengthDataImplementation.h"
namespace rti1516e
{
@@ -162,4 +163,4 @@
DECLARE_HANDLE_CLASS(MessageRetractionHandle)
DECLARE_HANDLE_CLASS(RegionHandle)
-} // end namespace rti1516
+} // end namespace rti1516e
Index: libRTI/ieee1516-2010/RTI1516fedTime.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/RTI1516fedTime.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/ieee1516-2010/RTI1516fedTime.cpp 3 Mar 2014 16:43:27 -0000
1.1
+++ libRTI/ieee1516-2010/RTI1516fedTime.cpp 7 Mar 2014 18:00:49 -0000
1.2
@@ -29,9 +29,10 @@
#include <memory>
#include <cstdlib>
#include <cstring>
+#include "certi.hh"
#include "RTI1516fedTime.h"
-#include "certi.hh"
+
rti1516e::LogicalTime &
rti1516e::LogicalTime::operator=(rti1516e::LogicalTime const & value)
Index: libRTI/ieee1516-2010/RTI1516fedTime.h
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/RTI1516fedTime.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/ieee1516-2010/RTI1516fedTime.h 3 Mar 2014 15:18:24 -0000
1.1
+++ libRTI/ieee1516-2010/RTI1516fedTime.h 7 Mar 2014 18:00:50 -0000
1.2
@@ -9,7 +9,7 @@
class VariableLengthData;
}
-class FEDTIME_EXPORT RTI1516fedTime : public rti1516e::LogicalTime
+class RTI_EXPORT_FEDTIME RTI1516fedTime : public rti1516e::LogicalTime
{
public:
RTI1516fedTime(double timeVal);
@@ -35,9 +35,9 @@
isFinal() const;
virtual
- rti1516::LogicalTime &
- operator=(rti1516::LogicalTime const & value)
- throw (rti1516::InvalidLogicalTime);
+ rti1516e::LogicalTime &
+ operator=(rti1516e::LogicalTime const & value)
+ throw (rti1516e::InvalidLogicalTime);
virtual
RTI1516fedTime &
@@ -45,45 +45,45 @@
throw ();
virtual
- rti1516::LogicalTime &
- operator+=(rti1516::LogicalTimeInterval const & addend)
- throw (rti1516::IllegalTimeArithmetic,
rti1516::InvalidLogicalTimeInterval);
+ rti1516e::LogicalTime &
+ operator+=(rti1516e::LogicalTimeInterval const & addend)
+ throw (rti1516e::IllegalTimeArithmetic,
rti1516e::InvalidLogicalTimeInterval);
virtual
- rti1516::LogicalTime &
- operator-=(rti1516::LogicalTimeInterval const & subtrahend)
- throw (rti1516::IllegalTimeArithmetic,
rti1516::InvalidLogicalTimeInterval);
+ rti1516e::LogicalTime &
+ operator-=(rti1516e::LogicalTimeInterval const & subtrahend)
+ throw (rti1516e::IllegalTimeArithmetic,
rti1516e::InvalidLogicalTimeInterval);
virtual
bool
- operator>(rti1516::LogicalTime const & value) const
- throw (rti1516::InvalidLogicalTime);
+ operator>(rti1516e::LogicalTime const & value) const
+ throw (rti1516e::InvalidLogicalTime);
virtual
bool
- operator<(rti1516::LogicalTime const & value) const
- throw (rti1516::InvalidLogicalTime);
+ operator<(rti1516e::LogicalTime const & value) const
+ throw (rti1516e::InvalidLogicalTime);
virtual
bool
- operator==(rti1516::LogicalTime const & value) const
- throw (rti1516::InvalidLogicalTime);
+ operator==(rti1516e::LogicalTime const & value) const
+ throw (rti1516e::InvalidLogicalTime);
virtual
bool
- operator>=(rti1516::LogicalTime const & value) const
- throw (rti1516::InvalidLogicalTime);
+ operator>=(rti1516e::LogicalTime const & value) const
+ throw (rti1516e::InvalidLogicalTime);
virtual
bool
- operator<=(rti1516::LogicalTime const & value) const
- throw (rti1516::InvalidLogicalTime);
+ operator<=(rti1516e::LogicalTime const & value) const
+ throw (rti1516e::InvalidLogicalTime);
// Generates an encoded value that can be used to send
// LogicalTimes to other federates in updates or interactions
// Not implemented.
virtual
- rti1516::VariableLengthData
+ rti1516e::VariableLengthData
encode() const;
// Alternate encode for directly filling a buffer
@@ -94,22 +94,22 @@
virtual
unsigned long
encode(void* buffer, unsigned long bufferSize) const
- throw (rti1516::CouldNotEncode);
+ throw (rti1516e::CouldNotEncode);
// Decode encodedLogicalTime into self
// Not implemented.
virtual
void
- decode(rti1516::VariableLengthData const & encodedLogicalTime)
- throw (rti1516::InternalError,
- rti1516::CouldNotDecode);
+ decode(rti1516e::VariableLengthData const & encodedLogicalTime)
+ throw (rti1516e::InternalError,
+ rti1516e::CouldNotDecode);
// Alternate decode that reads directly from a buffer
virtual
void
decode(void* buffer, unsigned long bufferSize)
- throw (rti1516::InternalError,
- rti1516::CouldNotDecode);
+ throw (rti1516e::InternalError,
+ rti1516e::CouldNotDecode);
virtual
std::wstring
@@ -136,7 +136,7 @@
}; // class RTI_EXPORT_FEDTIME RTI1516fedTime
-class FEDTIME_EXPORT RTI1516fedTimeInterval : public
rti1516::LogicalTimeInterval
+class RTI_EXPORT_FEDTIME RTI1516fedTimeInterval : public
rti1516e::LogicalTimeInterval
{
public:
RTI1516fedTimeInterval(double timeVal);
@@ -163,9 +163,9 @@
isEpsilon() const;
virtual
- rti1516::LogicalTimeInterval &
- operator=(rti1516::LogicalTimeInterval const & value)
- throw (rti1516::InvalidLogicalTimeInterval);
+ rti1516e::LogicalTimeInterval &
+ operator=(rti1516e::LogicalTimeInterval const & value)
+ throw (rti1516e::InvalidLogicalTimeInterval);
virtual
RTI1516fedTimeInterval &
@@ -175,50 +175,50 @@
// Set self to the difference between two LogicalTimes
virtual
void
- setToDifference(rti1516::LogicalTime const & minuend,
- rti1516::LogicalTime const& subtrahend)
- throw (rti1516::InvalidLogicalTime);
+ setToDifference(rti1516e::LogicalTime const & minuend,
+ rti1516e::LogicalTime const& subtrahend)
+ throw (rti1516e::InvalidLogicalTime);
virtual
- rti1516::LogicalTimeInterval &
- operator+=(rti1516::LogicalTimeInterval const & addend)
- throw (rti1516::InvalidLogicalTimeInterval);
+ rti1516e::LogicalTimeInterval &
+ operator+=(rti1516e::LogicalTimeInterval const & addend)
+ throw (rti1516e::InvalidLogicalTimeInterval);
virtual
- rti1516::LogicalTimeInterval &
- operator-=(rti1516::LogicalTimeInterval const & subtrahend)
- throw (rti1516::InvalidLogicalTimeInterval);
+ rti1516e::LogicalTimeInterval &
+ operator-=(rti1516e::LogicalTimeInterval const & subtrahend)
+ throw (rti1516e::InvalidLogicalTimeInterval);
virtual
bool
- operator>(rti1516::LogicalTimeInterval const & value) const
- throw (rti1516::InvalidLogicalTimeInterval);
+ operator>(rti1516e::LogicalTimeInterval const & value) const
+ throw (rti1516e::InvalidLogicalTimeInterval);
virtual
bool
- operator<(rti1516::LogicalTimeInterval const & value) const
- throw (rti1516::InvalidLogicalTimeInterval);
+ operator<(rti1516e::LogicalTimeInterval const & value) const
+ throw (rti1516e::InvalidLogicalTimeInterval);
virtual
bool
- operator==(rti1516::LogicalTimeInterval const & value) const
- throw (rti1516::InvalidLogicalTimeInterval);
+ operator==(rti1516e::LogicalTimeInterval const & value) const
+ throw (rti1516e::InvalidLogicalTimeInterval);
virtual
bool
- operator>=(rti1516::LogicalTimeInterval const & value) const
- throw (rti1516::InvalidLogicalTimeInterval);
+ operator>=(rti1516e::LogicalTimeInterval const & value) const
+ throw (rti1516e::InvalidLogicalTimeInterval);
virtual
bool
- operator<=(rti1516::LogicalTimeInterval const & value) const
- throw (rti1516::InvalidLogicalTimeInterval);
+ operator<=(rti1516e::LogicalTimeInterval const & value) const
+ throw (rti1516e::InvalidLogicalTimeInterval);
// Generates an encoded value that can be used to send
// LogicalTimeIntervals to other federates in updates or interactions
// Not implemented.
virtual
- rti1516::VariableLengthData
+ rti1516e::VariableLengthData
encode() const;
// Alternate encode for directly filling a buffer
@@ -229,20 +229,20 @@
virtual
unsigned long
encode(void* buffer, unsigned long bufferSize) const
- throw (rti1516::CouldNotEncode);
+ throw (rti1516e::CouldNotEncode);
// Decode encodedValue into self
// Not implemented.
virtual
void
- decode(rti1516::VariableLengthData const & encodedValue)
- throw (rti1516::InternalError, rti1516::CouldNotDecode);
+ decode(rti1516e::VariableLengthData const & encodedValue)
+ throw (rti1516e::InternalError, rti1516e::CouldNotDecode);
// Alternate decode that reads directly from a buffer
virtual
void
decode(void* buffer, unsigned long bufferSize)
- throw (rti1516::InternalError, rti1516::CouldNotDecode);
+ throw (rti1516e::InternalError, rti1516e::CouldNotDecode);
virtual
std::wstring
@@ -266,9 +266,9 @@
double _epsilon;
double _positiveInfinity;
-}; // class FEDTIME_EXPORT RTI1516fedTimeInterval
+}; // class RTI_EXPORT_FEDTIME RTI1516fedTimeInterval
-class FEDTIME_EXPORT RTI1516fedTimeFactory : public rti1516::LogicalTimeFactory
+class RTI_EXPORT_FEDTIME RTI1516fedTimeFactory : public
rti1516e::LogicalTimeFactory
{
public:
virtual
@@ -277,34 +277,34 @@
// Returns a LogicalTime with a value of "initial"
virtual
- std::auto_ptr< rti1516::LogicalTime >
+ std::auto_ptr< rti1516e::LogicalTime >
makeLogicalTime()
- throw (rti1516::InternalError);
+ throw (rti1516e::InternalError);
virtual
- std::auto_ptr< rti1516::LogicalTime >
+ std::auto_ptr< rti1516e::LogicalTime >
makeLogicalTime(double timeVal)
- throw (rti1516::InternalError);
+ throw (rti1516e::InternalError);
// Returns a LogicalTimeInterval with a value of "zero"
virtual
- std::auto_ptr< rti1516::LogicalTimeInterval >
+ std::auto_ptr< rti1516e::LogicalTimeInterval >
makeLogicalTimeInterval()
- throw (rti1516::InternalError);
+ throw (rti1516e::InternalError);
virtual
- std::auto_ptr< rti1516::LogicalTimeInterval >
+ std::auto_ptr< rti1516e::LogicalTimeInterval >
makeLogicalTimeInterval(double timeInterval)
- throw (rti1516::InternalError);
+ throw (rti1516e::InternalError);
private:
- friend class rti1516::LogicalTimeFactoryFactory;
+ friend class rti1516e::LogicalTimeFactoryFactory;
// Private constructor - Only for LogicalTimeFactoryFactory to access.
RTI1516fedTimeFactory()
throw();
-}; // class FEDTIME_EXPORT RTI1516fedTimeFactory
+}; // class RTI_EXPORT_FEDTIME RTI1516fedTimeFactory
@@ -314,7 +314,7 @@
//namespace rti1516
//{
-// class FEDTIME_EXPORT LogicalTimeFactoryFactory
+// class RTI_EXPORT_FEDTIME LogicalTimeFactoryFactory
// {
// public:
//
Index: libRTI/ieee1516-2010/RTIambassadorImplementation.h
===================================================================
RCS file:
/sources/certi/certi/libRTI/ieee1516-2010/RTIambassadorImplementation.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/ieee1516-2010/RTIambassadorImplementation.h 6 Mar 2014 16:11:32
-0000 1.1
+++ libRTI/ieee1516-2010/RTIambassadorImplementation.h 7 Mar 2014 18:00:50
-0000 1.2
@@ -35,8 +35,8 @@
class RTI_EXPORT RTI1516ambassador : rti1516e::RTIambassador
{
friend std::auto_ptr< rti1516e::RTIambassador >
- rti1516e::RTIambassadorFactory::createRTIambassador(std::vector<
std::wstring > & args)
- throw (rti1516e::BadInitializationParameter, rti1516e::RTIinternalError);
+ rti1516e::RTIambassadorFactory::createRTIambassador()
+ throw (rti1516e::RTIinternalError);
private:
RTI1516ambPrivateRefs* privateRefs ;
@@ -50,18 +50,37 @@
assignAHVMAndExecuteService(const rti1516e::AttributeHandleValueMap &AHVM,
T &req, T &rep);
// Helper function for CallBacks
bool __tick_kernel(bool, TickTime, TickTime)
- throw (rti1516e::SpecifiedSaveLabelDoesNotExist,
rti1516e::RTIinternalError);
+ throw (rti1516e::SpecifiedSaveLabelDoesNotExist,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
protected:
- RTI1516ambassador()
-throw ();
+ RTI1516ambassador() throw ();
public:
virtual
~RTI1516ambassador();
- // throw ()
// 4.2
+ virtual void connect (
+ rti1516e::FederateAmbassador & federateAmbassador,
+ rti1516e::CallbackModel theCallbackModel,
+ std::wstring const & localSettingsDesignator)
+ throw (
+ rti1516e::ConnectionFailed,
+ rti1516e::InvalidLocalSettingsDesignator,
+ rti1516e::UnsupportedCallbackModel,
+ rti1516e::AlreadyConnected,
+ rti1516e::CallNotAllowedFromWithinCallback,
+ rti1516e::RTIinternalError);
+
+ // 4.3
+ virtual void disconnect ()
+ throw (
+ rti1516e::FederateIsExecutionMember,
+ rti1516e::CallNotAllowedFromWithinCallback,
+ rti1516e::RTIinternalError);
+ // 4.5
virtual void createFederationExecution
(std::wstring const & federationExecutionName,
std::wstring const & fullPathNameToTheFDDfile,
@@ -70,6 +89,37 @@
rti1516e::CouldNotOpenFDD,
rti1516e::ErrorReadingFDD,
rti1516e::CouldNotCreateLogicalTimeFactory,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ virtual void createFederationExecution (
+ std::wstring const & federationExecutionName,
+ std::vector<std::wstring> const & fomModules,
+ std::wstring const & logicalTimeImplementationName = L"")
+ throw (
+ rti1516e::CouldNotCreateLogicalTimeFactory,
+ rti1516e::InconsistentFDD,
+ rti1516e::ErrorReadingFDD,
+ rti1516e::CouldNotOpenFDD,
+ rti1516e::FederationExecutionAlreadyExists,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ virtual void createFederationExecutionWithMIM (
+ std::wstring const & federationExecutionName,
+ std::vector<std::wstring> const & fomModules,
+ std::wstring const & mimModule,
+ std::wstring const & logicalTimeImplementationName = L"")
+ throw (
+ rti1516e::CouldNotCreateLogicalTimeFactory,
+ rti1516e::InconsistentFDD,
+ rti1516e::ErrorReadingFDD,
+ rti1516e::CouldNotOpenFDD,
+ rti1516e::DesignatorIsHLAstandardMIM,
+ rti1516e::ErrorReadingMIM,
+ rti1516e::CouldNotOpenMIM,
+ rti1516e::FederationExecutionAlreadyExists,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 4.3
@@ -77,35 +127,67 @@
(std::wstring const & federationExecutionName)
throw (rti1516e::FederatesCurrentlyJoined,
rti1516e::FederationExecutionDoesNotExist,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ virtual void listFederationExecutions ()
+ throw (
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 4.4
+ // 4.9
virtual rti1516e::FederateHandle joinFederationExecution
(std::wstring const & federateType,
std::wstring const & federationExecutionName,
- rti1516e::FederateAmbassador & federateAmbassador)
- throw (rti1516e::FederateAlreadyExecutionMember,
+ std::vector<std::wstring> const & additionalFomModules)
+ throw (rti1516e::CouldNotCreateLogicalTimeFactory,
+ rti1516e::FederationExecutionDoesNotExist,
+ rti1516e::InconsistentFDD,
+ rti1516e::ErrorReadingFDD,
+ rti1516e::CouldNotOpenFDD,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateAlreadyExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::CallNotAllowedFromWithinCallback,
+ rti1516e::RTIinternalError);
+
+ virtual rti1516e::FederateHandle joinFederationExecution
+ (std::wstring const & federateName,
+ std::wstring const & federateType,
+ std::wstring const & federationExecutionName,
+ std::vector<std::wstring> const & additionalFomModules)
+ throw (rti1516e::CouldNotCreateLogicalTimeFactory,
rti1516e::FederationExecutionDoesNotExist,
+ rti1516e::InconsistentFDD,
+ rti1516e::ErrorReadingFDD,
+ rti1516e::CouldNotOpenFDD,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
- rti1516e::CouldNotCreateLogicalTimeFactory,
+ rti1516e::FederateAlreadyExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::CallNotAllowedFromWithinCallback,
rti1516e::RTIinternalError);
- // 4.5
+ // 4.10
virtual void resignFederationExecution
(rti1516e::ResignAction resignAction)
- throw (rti1516e::OwnershipAcquisitionPending,
+ throw (rti1516e::InvalidResignAction,
+ rti1516e::OwnershipAcquisitionPending,
rti1516e::FederateOwnsAttributes,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::CallNotAllowedFromWithinCallback,
rti1516e::RTIinternalError);
- // 4.6
+ // 4.11
virtual void registerFederationSynchronizationPoint
(std::wstring const & label,
rti1516e::VariableLengthData const & theUserSuppliedTag)
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual void registerFederationSynchronizationPoint
@@ -115,23 +197,26 @@
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 4.9
+ // 4.14
virtual void synchronizationPointAchieved
- (std::wstring const & label)
+ (std::wstring const & label, bool successfully)
throw (rti1516e::SynchronizationPointLabelNotAnnounced,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 4.11
+ // 4.16
virtual void requestFederationSave
(std::wstring const & label)
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual void requestFederationSave
@@ -143,59 +228,81 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 4.13
+ // 4.18
virtual void federateSaveBegun ()
throw (rti1516e::SaveNotInitiated,
rti1516e::FederateNotExecutionMember,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 4.14
+ // 4.19
virtual void federateSaveComplete ()
throw (rti1516e::FederateHasNotBegunSave,
rti1516e::FederateNotExecutionMember,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual void federateSaveNotComplete()
throw (rti1516e::FederateHasNotBegunSave,
rti1516e::FederateNotExecutionMember,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 4.16
+ // 4.21
+ virtual void abortFederationSave ()
+ throw (rti1516e::FederateNotExecutionMember,
+ rti1516e::SaveNotInProgress,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 4.22
virtual void queryFederationSaveStatus ()
throw (rti1516e::FederateNotExecutionMember,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 4.18
+ // 4.24
virtual void requestFederationRestore
(std::wstring const & label)
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 4.22
+ // 4.28
virtual void federateRestoreComplete ()
throw (rti1516e::RestoreNotRequested,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual void federateRestoreNotComplete ()
throw (rti1516e::RestoreNotRequested,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
-
- // 4.24
+ // 4.30
+ virtual void abortFederationRestore ()
+ throw (
+ rti1516e::RestoreNotInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+ // 4.31
virtual void queryFederationRestoreStatus ()
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
/////////////////////////////////////
@@ -211,6 +318,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 5.3
@@ -221,6 +329,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual void unpublishObjectClassAttributes
@@ -232,6 +341,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 5.4
@@ -241,6 +351,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 5.5
@@ -250,18 +361,20 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 5.6
virtual void subscribeObjectClassAttributes
(rti1516e::ObjectClassHandle theClass,
rti1516e::AttributeHandleSet const & attributeList,
- bool active = true)
+ bool active, std::wstring const & updateRateDesignator)
throw (rti1516e::ObjectClassNotDefined,
rti1516e::AttributeNotDefined,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 5.7
@@ -271,6 +384,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual void unsubscribeObjectClassAttributes
@@ -281,6 +395,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 5.8
@@ -292,6 +407,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 5.9
@@ -301,6 +417,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
////////////////////////////////
@@ -314,9 +431,44 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 6.4
+ virtual void releaseObjectInstanceName (
+ std::wstring const & theObjectInstanceName)
+ throw (
+ rti1516e::ObjectInstanceNameNotReserved,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 6.5
+ virtual void reserveMultipleObjectInstanceName (
+ std::set<std::wstring> const & theObjectInstanceNames)
+ throw (
+ rti1516e::IllegalName,
+ rti1516e::NameSetWasEmpty,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 6.7
+ virtual void releaseMultipleObjectInstanceName (
+ std::set<std::wstring> const & theObjectInstanceNames)
+ throw (
+ rti1516e::ObjectInstanceNameNotReserved,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 6.8
virtual rti1516e::ObjectInstanceHandle registerObjectInstance
(rti1516e::ObjectClassHandle theClass)
throw (rti1516e::ObjectClassNotDefined,
@@ -324,6 +476,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual rti1516e::ObjectInstanceHandle registerObjectInstance
@@ -336,9 +489,10 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 6.6
+ // 6.10
virtual void updateAttributeValues
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleValueMap const & theAttributeValues,
@@ -349,6 +503,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual rti1516e::MessageRetractionHandle updateAttributeValues
@@ -363,9 +518,10 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 6.8
+ // 6.12
virtual void sendInteraction
(rti1516e::InteractionClassHandle theInteraction,
rti1516e::ParameterHandleValueMap const & theParameterValues,
@@ -376,6 +532,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual rti1516e::MessageRetractionHandle sendInteraction
@@ -390,9 +547,10 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 6.10
+ // 6.14
virtual void deleteObjectInstance
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::VariableLengthData const & theUserSuppliedTag)
@@ -401,6 +559,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual rti1516e::MessageRetractionHandle deleteObjectInstance
@@ -413,9 +572,10 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 6.12
+ // 6.16
virtual void localDeleteObjectInstance
(rti1516e::ObjectInstanceHandle theObject)
throw (rti1516e::ObjectInstanceNotKnown,
@@ -424,53 +584,89 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 6.13
- virtual void changeAttributeTransportationType
+ // 6.19
+ virtual void requestAttributeValueUpdate
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleSet const & theAttributes,
- rti1516e::TransportationType theType)
+ rti1516e::VariableLengthData const & theUserSuppliedTag)
throw (rti1516e::ObjectInstanceNotKnown,
rti1516e::AttributeNotDefined,
- rti1516e::AttributeNotOwned,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 6.14
- virtual void changeInteractionTransportationType
- (rti1516e::InteractionClassHandle theClass,
- rti1516e::TransportationType theType)
- throw (rti1516e::InteractionClassNotDefined,
- rti1516e::InteractionClassNotPublished,
+ virtual void requestAttributeValueUpdate
+ (rti1516e::ObjectClassHandle theClass,
+ rti1516e::AttributeHandleSet const & theAttributes,
+ rti1516e::VariableLengthData const & theUserSuppliedTag)
+ throw (rti1516e::ObjectClassNotDefined,
+ rti1516e::AttributeNotDefined,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 6.17
- virtual void requestAttributeValueUpdate
- (rti1516e::ObjectInstanceHandle theObject,
+ // 6.23
+ virtual void requestAttributeTransportationTypeChange (
+ rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleSet const & theAttributes,
- rti1516e::VariableLengthData const & theUserSuppliedTag)
- throw (rti1516e::ObjectInstanceNotKnown,
+ rti1516e::TransportationType theType)
+ throw (
+ rti1516e::AttributeAlreadyBeingChanged,
+ rti1516e::AttributeNotOwned,
rti1516e::AttributeNotDefined,
- rti1516e::FederateNotExecutionMember,
+ rti1516e::ObjectInstanceNotKnown,
+ rti1516e::InvalidTransportationType,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- virtual void requestAttributeValueUpdate
- (rti1516e::ObjectClassHandle theClass,
- rti1516e::AttributeHandleSet const & theAttributes,
- rti1516e::VariableLengthData const & theUserSuppliedTag)
- throw (rti1516e::ObjectClassNotDefined,
+ // 6.25
+ virtual void queryAttributeTransportationType (
+ rti1516e::ObjectInstanceHandle theObject,
+ rti1516e::AttributeHandle theAttribute)
+ throw (
rti1516e::AttributeNotDefined,
+ rti1516e::ObjectInstanceNotKnown,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 6.27
+ virtual void requestInteractionTransportationTypeChange (
+ rti1516e::InteractionClassHandle theClass,
+ rti1516e::TransportationType theType)
+ throw (
+ rti1516e::InteractionClassAlreadyBeingChanged,
+ rti1516e::InteractionClassNotPublished,
+ rti1516e::InteractionClassNotDefined,
+ rti1516e::InvalidTransportationType,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 6.29
+ virtual void queryInteractionTransportationType (
+ rti1516e::FederateHandle theFederate,
+ rti1516e::InteractionClassHandle theInteraction)
+ throw (
+ rti1516e::InteractionClassNotDefined,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
///////////////////////////////////
@@ -486,6 +682,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 7.3
@@ -500,6 +697,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 7.6
@@ -515,6 +713,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 7.8
@@ -530,6 +729,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 7.9
@@ -545,9 +745,24 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 7.12
+ virtual void attributeOwnershipReleaseDenied (
+ rti1516e::ObjectInstanceHandle theObject,
+ rti1516e::AttributeHandleSet const & theAttributes)
+ throw (
+ rti1516e::AttributeNotOwned,
+ rti1516e::AttributeNotDefined,
+ rti1516e::ObjectInstanceNotKnown,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 7.13
virtual void attributeOwnershipDivestitureIfWanted
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleSet const & theAttributes,
@@ -558,9 +773,10 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 7.13
+ // 7.14
virtual void cancelNegotiatedAttributeOwnershipDivestiture
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleSet const & theAttributes)
@@ -571,9 +787,10 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 7.14
+ // 7.15
virtual void cancelAttributeOwnershipAcquisition
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandleSet const & theAttributes)
@@ -584,9 +801,10 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 7.16
+ // 7.17
virtual void queryAttributeOwnership
(rti1516e::ObjectInstanceHandle theObject,
rti1516e::AttributeHandle theAttribute)
@@ -595,6 +813,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 7.18
@@ -606,6 +825,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
//////////////////////////////
@@ -622,6 +842,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.4
@@ -630,6 +851,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.5
@@ -640,6 +862,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.7
@@ -648,6 +871,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.8
@@ -661,6 +885,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.9
@@ -674,6 +899,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.10
@@ -687,6 +913,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.11
@@ -700,6 +927,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.12
@@ -713,6 +941,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.14
@@ -721,6 +950,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.15
@@ -729,6 +959,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.16
@@ -736,6 +967,7 @@
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.17
@@ -743,6 +975,7 @@
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.18
@@ -750,6 +983,7 @@
throw (rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.19
@@ -761,6 +995,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.20
@@ -769,17 +1004,19 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.21
virtual void retract
(rti1516e::MessageRetractionHandle theHandle)
- throw (rti1516e::InvalidRetractionHandle,
+ throw (rti1516e::InvalidMessageRetractionHandle,
rti1516e::TimeRegulationIsNotEnabled,
rti1516e::MessageCanNoLongerBeRetracted,
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.23
@@ -793,6 +1030,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 8.24
@@ -804,6 +1042,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
//////////////////////////////////
@@ -817,6 +1056,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.3
@@ -827,17 +1067,19 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.4
virtual void deleteRegion
- (rti1516e::RegionHandle theRegion)
- throw (rti1516e::InvalidRegion,
+ (rti1516e::RegionHandle const & theRegion)
+ throw (rti1516e::RegionInUseForUpdateOrSubscription,
rti1516e::RegionNotCreatedByThisFederate,
- rti1516e::RegionInUseForUpdateOrSubscription,
- rti1516e::FederateNotExecutionMember,
+ rti1516e::InvalidRegion,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.5
@@ -855,6 +1097,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual rti1516e::ObjectInstanceHandle registerObjectInstanceWithRegions
@@ -874,6 +1117,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.6
@@ -889,6 +1133,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.7
@@ -903,6 +1148,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.8
@@ -910,7 +1156,7 @@
(rti1516e::ObjectClassHandle theClass,
rti1516e::AttributeHandleSetRegionHandleSetPairVector const &
theAttributeHandleSetRegionHandleSetPairVector,
- bool active = true)
+ bool active, std::wstring const & updateRateDesignator)
throw (rti1516e::ObjectClassNotDefined,
rti1516e::AttributeNotDefined,
rti1516e::InvalidRegion,
@@ -919,6 +1165,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.9
@@ -933,6 +1180,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.10
@@ -948,6 +1196,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.11
@@ -960,6 +1209,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.12
@@ -977,6 +1227,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
virtual rti1516e::MessageRetractionHandle sendInteractionWithRegions
@@ -995,6 +1246,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 9.13
@@ -1010,36 +1262,101 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
//////////////////////////
// RTI Support Services //
//////////////////////////
-
// 10.2
+ virtual rti1516e::ResignAction getAutomaticResignDirective ()
+ throw (
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.3
+ virtual void setAutomaticResignDirective (
+ rti1516e::ResignAction resignAction)
+ throw (
+ rti1516e::InvalidResignAction,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.4
+ virtual rti1516e::FederateHandle getFederateHandle (
+ std::wstring const & theName)
+ throw (
+ rti1516e::NameNotFound,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.5
+ virtual std::wstring getFederateName (
+ rti1516e::FederateHandle theHandle)
+ throw (
+ rti1516e::InvalidFederateHandle,
+ rti1516e::FederateHandleNotKnown,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.6
virtual rti1516e::ObjectClassHandle getObjectClassHandle
(std::wstring const & theName)
throw (rti1516e::NameNotFound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.3
+ // 10.7
virtual std::wstring getObjectClassName
(rti1516e::ObjectClassHandle theHandle)
throw (rti1516e::InvalidObjectClassHandle,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.4
+ // 10.8
+ rti1516e::ObjectClassHandle getKnownObjectClassHandle (
+ rti1516e::ObjectInstanceHandle theObject)
+ throw (
+ rti1516e::ObjectInstanceNotKnown,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.9
+ rti1516e::ObjectInstanceHandle getObjectInstanceHandle (
+ std::wstring const & theName)
+ throw (
+ rti1516e::ObjectInstanceNotKnown,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.10
+ std::wstring getObjectInstanceName (
+ rti1516e::ObjectInstanceHandle theHandle)
+ throw (
+ rti1516e::ObjectInstanceNotKnown,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.11
virtual rti1516e::AttributeHandle getAttributeHandle
(rti1516e::ObjectClassHandle whichClass,
std::wstring const & theAttributeName)
throw (rti1516e::InvalidObjectClassHandle,
rti1516e::NameNotFound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.5
+ // 10.12
virtual std::wstring getAttributeName
(rti1516e::ObjectClassHandle whichClass,
rti1516e::AttributeHandle theHandle)
@@ -1047,32 +1364,56 @@
rti1516e::InvalidAttributeHandle,
rti1516e::AttributeNotDefined,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.6
+ // 10.13
+ virtual double getUpdateRateValue (
+ std::wstring const & updateRateDesignator)
+ throw (
+ rti1516e::InvalidUpdateRateDesignator,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.14
+ virtual double getUpdateRateValueForAttribute (
+ rti1516e::ObjectInstanceHandle theObject,
+ rti1516e::AttributeHandle theAttribute)
+ throw (
+ rti1516e::ObjectInstanceNotKnown,
+ rti1516e::AttributeNotDefined,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.15
virtual rti1516e::InteractionClassHandle getInteractionClassHandle
(std::wstring const & theName)
throw (rti1516e::NameNotFound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.7
+ // 10.16
virtual std::wstring getInteractionClassName
(rti1516e::InteractionClassHandle theHandle)
throw (rti1516e::InvalidInteractionClassHandle,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.8
+ // 10.17
virtual rti1516e::ParameterHandle getParameterHandle
(rti1516e::InteractionClassHandle whichClass,
std::wstring const & theName)
throw (rti1516e::InvalidInteractionClassHandle,
rti1516e::NameNotFound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.9
+ // 10.18
virtual std::wstring getParameterName
(rti1516e::InteractionClassHandle whichClass,
rti1516e::ParameterHandle theHandle)
@@ -1080,41 +1421,39 @@
rti1516e::InvalidParameterHandle,
rti1516e::InteractionParameterNotDefined,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.10
- virtual rti1516e::ObjectInstanceHandle getObjectInstanceHandle
- (std::wstring const & theName)
- throw (rti1516e::ObjectInstanceNotKnown,
- rti1516e::FederateNotExecutionMember,
- rti1516e::RTIinternalError);
-
- // 10.11
- virtual std::wstring getObjectInstanceName
- (rti1516e::ObjectInstanceHandle theHandle)
- throw (rti1516e::ObjectInstanceNotKnown,
+ // 10.20
+ virtual rti1516e::OrderType getOrderType
+ (std::wstring const & orderName)
+ throw (rti1516e::InvalidOrderName,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.12
- virtual rti1516e::DimensionHandle getDimensionHandle
- (std::wstring const & theName)
- throw (rti1516e::NameNotFound,
+ // 10.21
+ virtual std::wstring getOrderName
+ (rti1516e::OrderType orderType)
+ throw (rti1516e::InvalidOrderType,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.13
- virtual std::wstring getDimensionName
- (rti1516e::DimensionHandle theHandle)
- throw (rti1516e::InvalidDimensionHandle,
+ // 10.18
+ virtual rti1516e::TransportationType getTransportationType
+ (std::wstring const & transportationName)
+ throw (rti1516e::InvalidTransportationName,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.14
- virtual unsigned long getDimensionUpperBound
- (rti1516e::DimensionHandle theHandle)
- throw (rti1516e::InvalidDimensionHandle,
+ // 10.19
+ virtual std::wstring getTransportationName
+ (rti1516e::TransportationType transportationType)
+ throw (rti1516e::InvalidTransportationType,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 10.15
@@ -1125,13 +1464,7 @@
rti1516e::InvalidAttributeHandle,
rti1516e::AttributeNotDefined,
rti1516e::FederateNotExecutionMember,
- rti1516e::RTIinternalError);
-
- // 10.16
- virtual rti1516e::ObjectClassHandle getKnownObjectClassHandle
- (rti1516e::ObjectInstanceHandle theObject)
- throw (rti1516e::ObjectInstanceNotKnown,
- rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 10.17
@@ -1139,34 +1472,86 @@
(rti1516e::InteractionClassHandle theClass)
throw (rti1516e::InvalidInteractionClassHandle,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.18
- virtual rti1516e::TransportationType getTransportationType
- (std::wstring const & transportationName)
- throw (rti1516e::InvalidTransportationName,
+ // 10.12
+ virtual rti1516e::DimensionHandle getDimensionHandle
+ (std::wstring const & theName)
+ throw (rti1516e::NameNotFound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.19
- virtual std::wstring getTransportationName
- (rti1516e::TransportationType transportationType)
- throw (rti1516e::InvalidTransportationType,
+ // 10.13
+ virtual std::wstring getDimensionName
+ (rti1516e::DimensionHandle theHandle)
+ throw (rti1516e::InvalidDimensionHandle,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.20
- virtual rti1516e::OrderType getOrderType
- (std::wstring const & orderName)
- throw (rti1516e::InvalidOrderName,
+ // 10.14
+ virtual unsigned long getDimensionUpperBound
+ (rti1516e::DimensionHandle theHandle)
+ throw (rti1516e::InvalidDimensionHandle,
rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.21
- virtual std::wstring getOrderName
- (rti1516e::OrderType orderType)
- throw (rti1516e::InvalidOrderType,
+ // 10.30
+ virtual
+ rti1516e::DimensionHandleSet getDimensionHandleSet
+ (rti1516e::RegionHandle theRegionHandle)
+ throw (rti1516e::InvalidRegion,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.31
+ virtual
+ rti1516e::RangeBounds getRangeBounds
+ (rti1516e::RegionHandle theRegionHandle,
+ rti1516e::DimensionHandle theDimensionHandle)
+ throw (rti1516e::InvalidRegion,
+ rti1516e::RegionDoesNotContainSpecifiedDimension,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.32
+ virtual void setRangeBounds
+ (rti1516e::RegionHandle theRegionHandle,
+ rti1516e::DimensionHandle theDimensionHandle,
+ rti1516e::RangeBounds const & theRangeBounds)
+ throw (rti1516e::InvalidRegion,
+ rti1516e::RegionNotCreatedByThisFederate,
+ rti1516e::RegionDoesNotContainSpecifiedDimension,
+ rti1516e::InvalidRangeBound,
rti1516e::FederateNotExecutionMember,
+ rti1516e::SaveInProgress,
+ rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.33
+ virtual unsigned long normalizeFederateHandle
+ (rti1516e::FederateHandle theFederateHandle)
+ throw (rti1516e::FederateNotExecutionMember,
+ rti1516e::InvalidFederateHandle,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
+ // 10.34
+ virtual unsigned long normalizeServiceGroup
+ (rti1516e::ServiceGroup theServiceGroup)
+ throw (rti1516e::FederateNotExecutionMember,
+ rti1516e::InvalidServiceGroup,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 10.22
@@ -1175,6 +1560,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 10.23
@@ -1183,6 +1569,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 10.24
@@ -1191,6 +1578,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 10.25
@@ -1199,6 +1587,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 10.26
@@ -1207,6 +1596,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 10.27
@@ -1215,6 +1605,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 10.28
@@ -1223,6 +1614,7 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
// 10.29
@@ -1231,109 +1623,113 @@
rti1516e::FederateNotExecutionMember,
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
+ rti1516e::NotConnected,
rti1516e::RTIinternalError);
- // 10.30
- virtual
- rti1516e::DimensionHandleSet getDimensionHandleSet
- (rti1516e::RegionHandle theRegionHandle)
- throw (rti1516e::InvalidRegion,
- rti1516e::FederateNotExecutionMember,
- rti1516e::SaveInProgress,
- rti1516e::RestoreInProgress,
- rti1516e::RTIinternalError);
- // 10.31
- virtual
- rti1516e::RangeBounds getRangeBounds
- (rti1516e::RegionHandle theRegionHandle,
- rti1516e::DimensionHandle theDimensionHandle)
- throw (rti1516e::InvalidRegion,
- rti1516e::RegionDoesNotContainSpecifiedDimension,
- rti1516e::FederateNotExecutionMember,
- rti1516e::SaveInProgress,
- rti1516e::RestoreInProgress,
- rti1516e::RTIinternalError);
-
- // 10.32
- virtual void setRangeBounds
- (rti1516e::RegionHandle theRegionHandle,
- rti1516e::DimensionHandle theDimensionHandle,
- rti1516e::RangeBounds const & theRangeBounds)
- throw (rti1516e::InvalidRegion,
- rti1516e::RegionNotCreatedByThisFederate,
- rti1516e::RegionDoesNotContainSpecifiedDimension,
- rti1516e::InvalidRangeBound,
- rti1516e::FederateNotExecutionMember,
- rti1516e::SaveInProgress,
- rti1516e::RestoreInProgress,
- rti1516e::RTIinternalError);
-
- // 10.33
- virtual unsigned long normalizeFederateHandle
- (rti1516e::FederateHandle theFederateHandle)
- throw (rti1516e::FederateNotExecutionMember,
- rti1516e::InvalidFederateHandle,
- rti1516e::RTIinternalError);
-
- // 10.34
- virtual unsigned long normalizeServiceGroup
- (rti1516e::ServiceGroupIndicator theServiceGroup)
- throw (rti1516e::FederateNotExecutionMember,
- rti1516e::InvalidServiceGroup,
- rti1516e::RTIinternalError);
-
- // 10.37
+ // 10.41
virtual bool evokeCallback(double approximateMinimumTimeInSeconds)
- throw (rti1516e::FederateNotExecutionMember,
+ throw (rti1516e::CallNotAllowedFromWithinCallback,
rti1516e::RTIinternalError);
// 10.38
virtual bool evokeMultipleCallbacks(double approximateMinimumTimeInSeconds,
double approximateMaximumTimeInSeconds)
- throw (rti1516e::FederateNotExecutionMember,
+ throw (rti1516e::CallNotAllowedFromWithinCallback,
rti1516e::RTIinternalError);
// 10.39
virtual void enableCallbacks ()
- throw (rti1516e::FederateNotExecutionMember,
+ throw (
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
rti1516e::RTIinternalError);
// 10.40
virtual void disableCallbacks ()
- throw (rti1516e::FederateNotExecutionMember,
+ throw (
rti1516e::SaveInProgress,
rti1516e::RestoreInProgress,
rti1516e::RTIinternalError);
+ // Return instance of time factory being used by the federation
+ virtual std::auto_ptr<rti1516e::LogicalTimeFactory> getTimeFactory () const
+ throw (
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
+
virtual rti1516e::FederateHandle decodeFederateHandle(
- rti1516e::VariableLengthData const & encodedValue) const;
+ rti1516e::VariableLengthData const & encodedValue) const
+ throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
virtual rti1516e::ObjectClassHandle decodeObjectClassHandle(
- rti1516e::VariableLengthData const & encodedValue) const;
+ rti1516e::VariableLengthData const & encodedValue) const
+ throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
virtual rti1516e::InteractionClassHandle decodeInteractionClassHandle(
- rti1516e::VariableLengthData const & encodedValue) const;
+ rti1516e::VariableLengthData const & encodedValue) const
+ throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
virtual rti1516e::ObjectInstanceHandle decodeObjectInstanceHandle(
- rti1516e::VariableLengthData const & encodedValue) const;
+ rti1516e::VariableLengthData const & encodedValue) const
+ throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
virtual rti1516e::AttributeHandle decodeAttributeHandle(
- rti1516e::VariableLengthData const & encodedValue) const;
+ rti1516e::VariableLengthData const & encodedValue) const
+ throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
virtual rti1516e::ParameterHandle decodeParameterHandle(
- rti1516e::VariableLengthData const & encodedValue) const;
+ rti1516e::VariableLengthData const & encodedValue) const
+ throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
virtual rti1516e::DimensionHandle decodeDimensionHandle(
- rti1516e::VariableLengthData const & encodedValue) const;
+ rti1516e::VariableLengthData const & encodedValue) const
+ throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
virtual rti1516e::MessageRetractionHandle decodeMessageRetractionHandle(
- rti1516e::VariableLengthData const & encodedValue) const;
+ rti1516e::VariableLengthData const & encodedValue) const
+ throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
virtual rti1516e::RegionHandle decodeRegionHandle(
- rti1516e::VariableLengthData const & encodedValue) const;
+ rti1516e::VariableLengthData const & encodedValue) const
+ throw (
+ rti1516e::CouldNotDecode,
+ rti1516e::FederateNotExecutionMember,
+ rti1516e::NotConnected,
+ rti1516e::RTIinternalError);
};
}
Index: libRTI/ieee1516-2010/RTIHandleFactory.h
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/RTIHandleFactory.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/ieee1516-2010/RTIHandleFactory.h 3 Mar 2014 16:43:27 -0000
1.1
+++ libRTI/ieee1516-2010/RTIHandleFactory.h 7 Mar 2014 18:00:50 -0000
1.2
@@ -45,7 +45,7 @@
}
catch (...)
{
- throw rti1516::RTIinternalError(L"Incompatible object on input.");
+ throw rti1516e::RTIinternalError(L"Incompatible object on input.");
}
}
@@ -57,7 +57,7 @@
}
catch (...)
{
- throw rti1516::RTIinternalError(L"Incompatible object on input.");
+ throw rti1516e::RTIinternalError(L"Incompatible object on input.");
}
}
};
Index: libRTI/ieee1516-2010/RTIambassadorFactory.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/RTIambassadorFactory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/ieee1516-2010/RTIambassadorFactory.cpp 6 Mar 2014 16:11:32
-0000 1.1
+++ libRTI/ieee1516-2010/RTIambassadorFactory.cpp 7 Mar 2014 18:00:50
-0000 1.2
@@ -54,9 +54,8 @@
}
std::auto_ptr< rti1516e::RTIambassador >
-rti1516e::RTIambassadorFactory::createRTIambassador(std::vector< std::wstring
> & args)
-throw (BadInitializationParameter,
- RTIinternalError)
+rti1516e::RTIambassadorFactory::createRTIambassador()
+throw (rti1516e::RTIinternalError)
{
certi::RTI1516ambassador* p_ambassador(new certi::RTI1516ambassador());
Index: libRTI/ieee1516-2010/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libRTI/ieee1516-2010/CMakeLists.txt 6 Mar 2014 16:11:32 -0000 1.2
+++ libRTI/ieee1516-2010/CMakeLists.txt 7 Mar 2014 18:00:51 -0000 1.3
@@ -60,7 +60,6 @@
)
set(RTI1516e_LIB_INCLUDE
- ${CMAKE_BINARY_DIR}/include/hla-1_3/RTItypes.hh
${CMAKE_SOURCE_DIR}/include/ieee1516-2010/RTI/Enums.h
${CMAKE_SOURCE_DIR}/include/ieee1516-2010/RTI/Exception.h
${CMAKE_SOURCE_DIR}/include/ieee1516-2010/RTI/FederateAmbassador.h
Index: libRTI/ieee1516-2010/HandleImplementation.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/HandleImplementation.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libRTI/ieee1516-2010/HandleImplementation.cpp 6 Mar 2014 16:11:32
-0000 1.2
+++ libRTI/ieee1516-2010/HandleImplementation.cpp 7 Mar 2014 18:00:51
-0000 1.3
@@ -27,6 +27,7 @@
#include <cstring>
#include <stdint.h>
#include "HandleImplementation.h"
+#include "RTIvariableLengthDataImplementation.h"
namespace rti1516e
{
@@ -121,7 +122,6 @@
}
-
#define DECLARE_HANDLE_IMPLEMENTATION_CLASS(HIK) \
\
/* Constructs an invalid handle */ \
Index: libRTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/CMakeLists.txt,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- libRTI/CMakeLists.txt 6 Mar 2014 16:11:32 -0000 1.33
+++ libRTI/CMakeLists.txt 7 Mar 2014 18:00:51 -0000 1.34
@@ -7,4 +7,4 @@
# Process standard specific libRTI implementation
add_subdirectory(hla-1_3)
add_subdirectory(ieee1516-2000)
-#add_subdirectory(ieee1516-2010)
\ No newline at end of file
+add_subdirectory(ieee1516-2010)
\ No newline at end of file
Index: include/ieee1516-2010/RTI/RTIambassador.h
===================================================================
RCS file: /sources/certi/certi/include/ieee1516-2010/RTI/RTIambassador.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/ieee1516-2010/RTI/RTIambassador.h 9 Dec 2013 13:47:52 -0000
1.1
+++ include/ieee1516-2010/RTI/RTIambassador.h 7 Mar 2014 18:00:51 -0000
1.2
@@ -16,6 +16,8 @@
#ifndef RTI_RTIambassador_h
#define RTI_RTIambassador_h
+#include <memory> /* need that for auto_ptr usage */
+
namespace rti1516e
{
class FederateAmbassador;
Index: include/ieee1516-2010/RTI/certiLogicalTimeInterval.h
===================================================================
RCS file:
/sources/certi/certi/include/ieee1516-2010/RTI/certiLogicalTimeInterval.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- include/ieee1516-2010/RTI/certiLogicalTimeInterval.h 6 Mar 2014
16:11:32 -0000 1.2
+++ include/ieee1516-2010/RTI/certiLogicalTimeInterval.h 7 Mar 2014
18:00:51 -0000 1.3
@@ -43,7 +43,7 @@
namespace rti1516e
{
- class FEDTIME_EXPORT LogicalTimeInterval
+ class RTI_EXPORT_FEDTIME LogicalTimeInterval
{
public:
virtual
Index: include/ieee1516-2010/RTI/certiLogicalTime.h
===================================================================
RCS file: /sources/certi/certi/include/ieee1516-2010/RTI/certiLogicalTime.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- include/ieee1516-2010/RTI/certiLogicalTime.h 6 Mar 2014 16:11:33
-0000 1.2
+++ include/ieee1516-2010/RTI/certiLogicalTime.h 7 Mar 2014 18:00:51
-0000 1.3
@@ -44,7 +44,7 @@
namespace rti1516e
{
- class FEDTIME_EXPORT LogicalTime
+ class RTI_EXPORT_FEDTIME LogicalTime
{
public:
virtual
Index: include/ieee1516-2010/RTI/SpecificConfig.h
===================================================================
RCS file: /sources/certi/certi/include/ieee1516-2010/RTI/SpecificConfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/ieee1516-2010/RTI/SpecificConfig.h 9 Dec 2013 13:47:52 -0000
1.1
+++ include/ieee1516-2010/RTI/SpecificConfig.h 7 Mar 2014 18:00:51 -0000
1.2
@@ -17,6 +17,40 @@
#ifndef RTI_SpecificConfig_h
#define RTI_SpecificConfig_h
+#ifdef _MSC_VER
+#ifndef FAKED_INTTYPES_DEFINED
+#define FAKED_INTTYPES_DEFINED
+typedef unsigned __int64 uint64_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int32 uint32_t;
+typedef signed __int32 int32_t;
+typedef unsigned __int16 uint16_t;
+typedef signed __int16 int16_t;
+typedef unsigned __int8 uint8_t;
+typedef signed __int8 int8_t;
+typedef short int int_least16_t;
+#endif
+#else
+#include <inttypes.h>
+#endif
+
+// DLL visibility macros helpers
+#if defined(_WIN32) || defined(__CYGWIN__)
+ #define ANY_DLL_EXPORT __declspec(dllexport)
+ #define ANY_DLL_IMPORT __declspec(dllimport)
+ #define ANY_DLL_LOCAL
+#else
+ #if (__GNUC__ >= 4)
+ #define ANY_DLL_EXPORT __attribute__ ((visibility("default")))
+ #define ANY_DLL_IMPORT __attribute__ ((visibility("default")))
+ #define ANY_DLL_LOCAL __attribute__ ((visibility("hidden")))
+ #else
+ #define ANY_DLL_EXPORT
+ #define ANY_DLL_IMPORT
+ #define ANY_DLL_LOCAL
+ #endif
+#endif
+
#if defined(_WIN32)
#if defined(_MSC_VER) && defined(RTI_DISABLE_WARNINGS)
// disable warning about truncating template instantiation symbol names
@@ -26,6 +60,7 @@
// disable warnings about a "dllexport" class using a regular class
#pragma warning(disable: 4251)
#endif
+
//
// On Windows, BUILDING_RTI should be defined only when compiling
// the RTI DLL (i.e. by RTI developers). BUILDING_FEDTIME should
@@ -59,9 +94,17 @@
#endif // STATIC_FEDTIME
#else // !_WIN32
-// no special qualfifers are necessary on non-WIN32 platforms
-#define RTI_EXPORT
-#define RTI_EXPORT_FEDTIME
+// no special qualifiers are necessary on non-WIN32 platforms
+#if defined(RTI_EXPORTS)
+ #define RTI_EXPORT ANY_DLL_EXPORT
+ #else
+ #define RTI_EXPORT ANY_DLL_IMPORT
+ #endif
+ #if defined(FedTime_EXPORTS)
+ #define RTI_EXPORT_FEDTIME ANY_DLL_EXPORT
+ #else
+ #define RTI_EXPORT_FEDTIME ANY_DLL_IMPORT
+ #endif
#endif
#endif // RTI_SpecificConfig_h
Index: include/ieee1516-2010/RTI/certiLogicalTimeFactory.h
===================================================================
RCS file:
/sources/certi/certi/include/ieee1516-2010/RTI/certiLogicalTimeFactory.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- include/ieee1516-2010/RTI/certiLogicalTimeFactory.h 6 Mar 2014 16:11:33
-0000 1.2
+++ include/ieee1516-2010/RTI/certiLogicalTimeFactory.h 7 Mar 2014 18:00:51
-0000 1.3
@@ -54,7 +54,7 @@
namespace rti1516e
{
- class FEDTIME_EXPORT LogicalTimeFactory
+ class RTI_EXPORT_FEDTIME LogicalTimeFactory
{
public:
virtual
@@ -75,9 +75,11 @@
};
}
-namespace rti1516
+
+namespace rti1516e
+
{
- class FEDTIME_EXPORT LogicalTimeFactoryFactory
+ class RTI_EXPORT_FEDTIME LogicalTimeFactoryFactory
{
public:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libRTI/ieee1516-2010/RTIambPrivateRefs.h ...,
CERTI CVS commits <=