[certi-cvs] certi/libRTI RTI1516ambPrivateRefs.cpp

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/02/18 11:25:39

Modified files:
        libRTI         : RTI1516ambPrivateRefs.cpp 

Log message:
        Fix  bug #32503 : federate callbacks are invoked with incorrect 
timestamp value

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTI1516ambPrivateRefs.cpp?cvsroot=certi&r1=1.2&r2=1.3

Patches:
Index: RTI1516ambPrivateRefs.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/RTI1516ambPrivateRefs.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RTI1516ambPrivateRefs.cpp   31 May 2010 09:33:25 -0000      1.2
+++ RTI1516ambPrivateRefs.cpp   18 Feb 2011 11:25:39 -0000      1.3
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RTI1516ambPrivateRefs.cpp,v 1.2 2010/05/31 09:33:25 erk Exp $
+// $Id: RTI1516ambPrivateRefs.cpp,v 1.3 2011/02/18 11:25:39 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -32,6 +32,7 @@
 #include <RTI/certiLogicalTimeInterval.h>
 #include <RTI/certiLogicalTimeFactory.h>
 #include "RTI1516HandleFactory.h"
+#include "RTI1516fedTime.h"
 
 #include "PrettyDebug.hh"
 #include "M_Classes.hh"
@@ -893,7 +894,7 @@
                                certi::FederateHandle certiHandle = 
RAV->getEventRetraction().getSendingFederate();
                                rti1516::MessageRetractionHandle event = 
rti1516::MessageRetractionHandleFriend::createRTI1516Handle(certiHandle, sn);
 
-                               std::auto_ptr < rti1516::LogicalTime > fedTime 
= getLogicalTime();
+                               std::auto_ptr < rti1516::LogicalTime > fedTime 
(new RTI1516fedTime(msg->getDate().getTime()));
 
                                fed_amb->reflectAttributeValues(instance, 
//ObjectInstanceHandle
                                                *attributes,                    
                                  //AttributeHandleValueMap &
@@ -932,7 +933,7 @@
                                certi::FederateHandle certiHandle = 
RI->getEventRetraction().getSendingFederate();
                                rti1516::MessageRetractionHandle event = 
rti1516::MessageRetractionHandleFriend::createRTI1516Handle(certiHandle, sn);
 
-                               std::auto_ptr < rti1516::LogicalTime > fedTime 
= getLogicalTime();
+                               std::auto_ptr < rti1516::LogicalTime > fedTime 
(new RTI1516fedTime(msg->getDate().getTime()));
 
                                fed_amb->receiveInteraction(
                                                interactionHandle,              
                                // InteractionClassHandle
@@ -972,7 +973,7 @@
                                certi::FederateHandle certiHandle = 
ROI->getEventRetraction().getSendingFederate();
                                rti1516::MessageRetractionHandle event = 
rti1516::MessageRetractionHandleFriend::createRTI1516Handle(certiHandle, sn);
 
-                               std::auto_ptr < rti1516::LogicalTime > fedTime 
= getLogicalTime();
+                               std::auto_ptr < rti1516::LogicalTime > fedTime 
(new RTI1516fedTime(msg->getDate().getTime()));
 
                                fed_amb->removeObjectInstance(
                                                instance,
@@ -1156,7 +1157,7 @@
 
        case Message::TIME_ADVANCE_GRANT:
                try {
-                       std::auto_ptr < rti1516::LogicalTime > fedTime = 
getLogicalTime();
+                       std::auto_ptr < rti1516::LogicalTime > fedTime (new 
RTI1516fedTime(msg->getDate().getTime()));
                        fed_amb->timeAdvanceGrant(*fedTime);
                }
                CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"timeAdvanceGrant")
@@ -1164,7 +1165,7 @@
 
        case Message::TIME_REGULATION_ENABLED:
                try {
-                       std::auto_ptr < rti1516::LogicalTime > fedTime = 
getLogicalTime();
+                       std::auto_ptr < rti1516::LogicalTime > fedTime (new 
RTI1516fedTime(msg->getDate().getTime()));
                        fed_amb->timeRegulationEnabled(*fedTime);
                }
                CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"timeRegulationEnabled")
@@ -1172,7 +1173,7 @@
 
        case Message::TIME_CONSTRAINED_ENABLED:
                try {
-                       std::auto_ptr < rti1516::LogicalTime > fedTime = 
getLogicalTime();
+                       std::auto_ptr < rti1516::LogicalTime > fedTime (new 
RTI1516fedTime(msg->getDate().getTime()));
                        fed_amb->timeConstrainedEnabled(*fedTime);
                }
                CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(L"timeConstrainedEnabled")
@@ -1205,4 +1206,4 @@
        }
 }
 
-// $Id: RTI1516ambPrivateRefs.cpp,v 1.2 2010/05/31 09:33:25 erk Exp $
+// $Id: RTI1516ambPrivateRefs.cpp,v 1.3 2011/02/18 11:25:39 erk Exp $