[certi-cvs] certi/libRTI/ieee1516-2010 RTIambassadorImpleme...

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      14/03/07 18:24:44

Modified files:
        libRTI/ieee1516-2010: RTIambassadorImplementation.cpp 
                              CMakeLists.txt Exception.cpp 
Added files:
        libRTI/ieee1516-2010: Typedefs.cpp 

Log message:
        Add the missings bit into libRTI for IEEE-1516-2010

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTIambassadorImplementation.cpp?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/CMakeLists.txt?cvsroot=certi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/Exception.cpp?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/Typedefs.cpp?cvsroot=certi&rev=1.1

Patches:
Index: RTIambassadorImplementation.cpp
===================================================================
RCS file: 
/sources/certi/certi/libRTI/ieee1516-2010/RTIambassadorImplementation.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RTIambassadorImplementation.cpp     7 Mar 2014 18:00:49 -0000       1.2
+++ RTIambassadorImplementation.cpp     7 Mar 2014 18:24:43 -0000       1.3
@@ -274,10 +274,10 @@
     // Ignored for now.
         }
 
-void createFederationExecution (
+void RTI1516ambassador::createFederationExecution (
    std::wstring const & federationExecutionName,
    std::vector<std::wstring> const & fomModules,
-   std::wstring const & logicalTimeImplementationName = L"")
+   std::wstring const & logicalTimeImplementationName)
    throw (
            rti1516e::CouldNotCreateLogicalTimeFactory,
            rti1516e::InconsistentFDD,
@@ -289,11 +289,11 @@
     throw rti1516e::RTIinternalError(L"Not Implemented");
 }
 
-void createFederationExecutionWithMIM (
+void RTI1516ambassador::createFederationExecutionWithMIM (
    std::wstring const & federationExecutionName,
    std::vector<std::wstring> const & fomModules,
    std::wstring const & mimModule,
-   std::wstring const & logicalTimeImplementationName = L"")
+   std::wstring const & logicalTimeImplementationName)
    throw (
            rti1516e::CouldNotCreateLogicalTimeFactory,
            rti1516e::InconsistentFDD,

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CMakeLists.txt      7 Mar 2014 18:00:51 -0000       1.3
+++ CMakeLists.txt      7 Mar 2014 18:24:44 -0000       1.4
@@ -57,6 +57,7 @@
     RTIfedAmbassador.cpp
     RTIHandleFactory.cpp
     RTIHandleFactory.h
+    Typedefs.cpp
    )
 
 set(RTI1516e_LIB_INCLUDE
@@ -81,7 +82,7 @@
 # Incorrect line
 #target_link_libraries(RTI1516 CERTI)
 # Correct line
-target_link_libraries(RTI1516e CERTI FedTime1516)
+target_link_libraries(RTI1516e CERTI FedTime1516e)
 install(FILES RTI1516fedTime.h DESTINATION include/ieee1516-2010/RTI)
 message(STATUS "libRTI variant: HLA 1516")
 set_target_properties(RTI1516e PROPERTIES OUTPUT_NAME "RTI1516e")

Index: Exception.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/Exception.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Exception.cpp       3 Mar 2014 16:43:26 -0000       1.1
+++ Exception.cpp       7 Mar 2014 18:24:44 -0000       1.2
@@ -96,6 +96,7 @@
 RTI_EXCEPTION_IMPL(CouldNotOpenMIM)
 RTI_EXCEPTION_IMPL(CouldNotInitiateRestore)
 RTI_EXCEPTION_IMPL(DeletePrivilegeNotHeld)
+RTI_EXCEPTION_IMPL(DesignatorIsHLAstandardMIM)
 RTI_EXCEPTION_IMPL(RequestForTimeConstrainedPending)
 RTI_EXCEPTION_IMPL(NoRequestToEnableTimeConstrainedWasPending)
 RTI_EXCEPTION_IMPL(RequestForTimeRegulationPending)

Index: Typedefs.cpp
===================================================================
RCS file: Typedefs.cpp
diff -N Typedefs.cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ Typedefs.cpp        7 Mar 2014 18:24:43 -0000       1.1
@@ -0,0 +1,102 @@
+// ----------------------------------------------------------------------------
+// CERTI - HLA RunTime Infrastructure
+// Copyright (C) 2002-2014  ONERA
+//
+// This file is part of CERTI-libRTI
+//
+// CERTI-libRTI is free software ; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation ; either version 2 of
+// the License, or (at your option) any later version.
+//
+// CERTI-libRTI is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY ; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this program ; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA
+//
+// ----------------------------------------------------------------------------
+#include <RTI/Typedefs.h>
+
+namespace rti1516e
+{
+FederateRestoreStatus::FederateRestoreStatus(FederateHandle const & 
thePreHandle,
+        FederateHandle const & thePostHandle,
+        RestoreStatus theStatus) :
+                         preRestoreHandle(thePostHandle),
+                         postRestoreHandle(thePostHandle),
+                         status(theStatus)
+{
+}
+
+FederationExecutionInformation::FederationExecutionInformation(
+        std::wstring const & theFederationExecutionName,
+        std::wstring const & theLogicalTimeImplementationName) :
+                federationExecutionName(theFederationExecutionName),
+                logicalTimeImplementationName(theLogicalTimeImplementationName)
+{
+}
+
+SupplementalReflectInfo::SupplementalReflectInfo() :
+        hasProducingFederate(true), hasSentRegions(false)
+{
+}
+
+SupplementalReflectInfo::SupplementalReflectInfo (
+         FederateHandle const & theFederateHandle) :
+                 hasProducingFederate(true), hasSentRegions(false), 
producingFederate(theFederateHandle)
+    {
+
+    }
+SupplementalReflectInfo::SupplementalReflectInfo (
+         RegionHandleSet const & theRegionHandleSet) :
+        hasProducingFederate(false), hasSentRegions(true), 
sentRegions(theRegionHandleSet)
+    {
+
+    }
+SupplementalReflectInfo::SupplementalReflectInfo (
+         FederateHandle const & theFederateHandle,
+         RegionHandleSet const & theRegionHandleSet) :
+        hasProducingFederate(true), hasSentRegions(true),
+        producingFederate(theFederateHandle), sentRegions(theRegionHandleSet)
+    {
+    }
+SupplementalReceiveInfo::SupplementalReceiveInfo() :
+        hasProducingFederate(true), hasSentRegions(false)
+{
+}
+
+SupplementalReceiveInfo::SupplementalReceiveInfo (
+         FederateHandle const & theFederateHandle) :
+                 hasProducingFederate(true), hasSentRegions(false), 
producingFederate(theFederateHandle)
+    {
+
+    }
+SupplementalReceiveInfo::SupplementalReceiveInfo (
+         RegionHandleSet const & theRegionHandleSet) :
+        hasProducingFederate(false), hasSentRegions(true), 
sentRegions(theRegionHandleSet)
+    {
+
+    }
+SupplementalReceiveInfo::SupplementalReceiveInfo (
+         FederateHandle const & theFederateHandle,
+         RegionHandleSet const & theRegionHandleSet) :
+        hasProducingFederate(true), hasSentRegions(true),
+        producingFederate(theFederateHandle), sentRegions(theRegionHandleSet)
+    {
+    }
+
+SupplementalRemoveInfo::SupplementalRemoveInfo() :
+        hasProducingFederate(false)
+{
+}
+
+SupplementalRemoveInfo::SupplementalRemoveInfo(FederateHandle const & 
theFederateHandle) :
+        hasProducingFederate(true), producingFederate(theFederateHandle)
+{
+}
+} // end namespace rti1516e