certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] certi libCERTI/NetworkMessage_RW.cc libCERTI/Ne...


From: certi-cvs
Subject: [certi-cvs] certi libCERTI/NetworkMessage_RW.cc libCERTI/Ne...
Date: Fri, 09 May 2008 20:21:41 +0000

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      08/05/09 20:21:41

Modified files:
        libCERTI       : NetworkMessage_RW.cc NetworkMessage.hh 
                         NetworkMessage.cc NM_Classes.cc 
        RTIA           : TimeManagement.cc ObjectManagement.cc 
                         RTIA_network.cc 
        RTIG           : RTIG_processing.cc 

Log message:
        Some NetworkMessage field should be private
        in order to enforce getter/setter usage.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&r1=3.48&r2=3.49
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.32&r2=3.33
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.cc?cvsroot=certi&r1=3.31&r2=3.32
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&r1=3.3&r2=3.4
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.37&r2=3.38
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.41&r2=3.42
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_network.cc?cvsroot=certi&r1=3.24&r2=3.25
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.66&r2=3.67

Patches:
Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.48
retrieving revision 3.49
diff -u -b -r3.48 -r3.49
--- libCERTI/NetworkMessage_RW.cc       7 May 2008 15:37:37 -0000       3.48
+++ libCERTI/NetworkMessage_RW.cc       9 May 2008 20:21:39 -0000       3.49
@@ -16,7 +16,7 @@
 // License along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: NetworkMessage_RW.cc,v 3.48 2008/05/07 15:37:37 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.49 2008/05/09 20:21:39 erk Exp $
 // ----------------------------------------------------------------------------
 #include "NetworkMessage.hh"
 #include "PrettyDebug.hh"
@@ -51,17 +51,17 @@
         * isDated may be chosen on Message instance basis
         * (same message may Dated or Not Dated) 
         */
-       msgBuffer.write_bool(isDated);
-       if (isDated) {
+       msgBuffer.write_bool(_isDated);
+       if (_isDated) {
                msgBuffer.write_double(date);
                D.Out(pdDebug, "Sent Message date is  <%f>", date);
        }       
-       msgBuffer.write_bool(isLabelled);
-       if (isLabelled) {
+       msgBuffer.write_bool(_isLabelled);
+       if (_isLabelled) {
                msgBuffer.write_string(label);
        }
-       msgBuffer.write_bool(isTagged);
-       if (isTagged) {
+       msgBuffer.write_bool(_isTagged);
+       if (_isTagged) {
                msgBuffer.write_string(tag);
        }
        G.Out(pdGendoc,"exit NetworkMessage::serialize");
@@ -84,17 +84,17 @@
         * isDated may be chosen on Message instance basis
         * (same message may Dated or Not Dated) 
         */
-       isDated = msgBuffer.read_bool();
-       if (isDated) {
+       _isDated = msgBuffer.read_bool();
+       if (_isDated) {
                date = msgBuffer.read_double();
                D.Out(pdDebug, "Received Message date is  <%f>", date);
        }
-       isLabelled = msgBuffer.read_bool();
-       if (isLabelled) {
+       _isLabelled = msgBuffer.read_bool();
+       if (_isLabelled) {
                label = msgBuffer.read_string();
        }
-       isTagged = msgBuffer.read_bool();
-       if (isTagged) {
+       _isTagged = msgBuffer.read_bool();
+       if (_isTagged) {
                tag = msgBuffer.read_string();
        }
        G.Out(pdGendoc,"exit NetworkMessage::deserialize");
@@ -146,4 +146,4 @@
 
 } // namespace certi
 
-// $Id: NetworkMessage_RW.cc,v 3.48 2008/05/07 15:37:37 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.49 2008/05/09 20:21:39 erk Exp $

Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.32
retrieving revision 3.33
diff -u -b -r3.32 -r3.33
--- libCERTI/NetworkMessage.hh  7 May 2008 15:37:37 -0000       3.32
+++ libCERTI/NetworkMessage.hh  9 May 2008 20:21:39 -0000       3.33
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: NetworkMessage.hh,v 3.32 2008/05/07 15:37:37 erk Exp $
+// $Id: NetworkMessage.hh,v 3.33 2008/05/09 20:21:39 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_NETWORK_MESSAGE_HH
@@ -225,14 +225,14 @@
        bool boolean ;
 
        /**
-        * Indicate if the message is dated or not
+        * Indicate if the message is dated/timestamped or not
         */
-       bool isDated;
+       bool isDated() {return _isDated;};
        /** 
         * If ones set Date then this is a Dated message
         * Message builder which setDate will generate a Dated message 
         */
-       void setDate(FederationTime date) {isDated=true; this->date = date;};
+       void setDate(FederationTime date) {_isDated=true; this->date = date;};
        const FederationTime getDate() const {return this->date;};
 
        unsigned long multicastAddress ;
@@ -240,18 +240,17 @@
        /**
         * Indicate if the message is Labelled or not
         */
-       bool isLabelled;        
-
-       void setLabel(const std::string label) {isLabelled = true; this->label 
= label;};
-       void setLabel(const char *new_label) {isLabelled = true; label = 
std::string(new_label); }
+       bool isLabelled() {return _isLabelled;};        
+       void setLabel(const std::string label) {_isLabelled = true; this->label 
= label;};
+       void setLabel(const char *new_label) {_isLabelled = true; label = 
std::string(new_label); }
        const std::string getLabel() const {return this->label;};
 
        /**
         * Indicate if the message is Tagged or not
         */
-       bool isTagged;
-       void setTag(const std::string tag) {isTagged = true; this->tag = tag;};
-       void setTag(const char *new_tag) {isTagged = true; tag = 
std::string(new_tag); }
+       bool isTagged() {return _isTagged;};
+       void setTag(const std::string tag) {_isTagged = true; this->tag = tag;};
+       void setTag(const char *new_tag) {_isTagged = true; tag = 
std::string(new_tag); }
        const std::string getTag() const {return this->tag;};
 
        ObjectHandlecount idCount ;
@@ -311,12 +310,22 @@
         */
        Message_T type;
 
+       // ValueArray is now a ValueLengthPair
+       ValueLengthPair ValueArray[MAX_ATTRIBUTES_PER_CLASS] ;
+
+private:
        /** 
         * The date of message if it is dated.
         * date field cannot be accessed directly but only using
         * getter/setter.
         */
-       FederationTime date ;
+       FederationTime date;
+       /**
+        * True is the message is dated
+        * When a message is dated the date is transmitted
+        * over the network, when not dated the date is not sent.
+        */
+       bool _isDated;
 
        /** 
         * The label of message if it is labelled.
@@ -325,16 +334,24 @@
         */
        std::string label;
        /** 
+        * True is the message contains a label
+        * When a message is labelled the label is transmitted
+        * over the network, when not labelled the label is not sent.
+        */
+       bool _isLabelled;
+       
+       /** 
         * The tag of message if it is tagged.
         * date field cannot be accessed directly but only using
         * getter/setter.
         */
        std::string tag;
-
-       // ValueArray is now a ValueLengthPair
-       ValueLengthPair ValueArray[MAX_ATTRIBUTES_PER_CLASS] ;
-
-private:
+       /**
+        * True is the message contains a tag
+        * When a message is tagged the tag is transmitted
+        * over the network, when not tagged the tag is not sent.
+        */
+       bool _isTagged;
 };
 
 // BUG: FIXME this is used by SocketMC and should
@@ -345,4 +362,4 @@
 
 #endif // CERTI_NETWORK_MESSAGE_HH
 
-// $Id: NetworkMessage.hh,v 3.32 2008/05/07 15:37:37 erk Exp $
+// $Id: NetworkMessage.hh,v 3.33 2008/05/09 20:21:39 erk Exp $

Index: libCERTI/NetworkMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.cc,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -b -r3.31 -r3.32
--- libCERTI/NetworkMessage.cc  7 May 2008 15:37:37 -0000       3.31
+++ libCERTI/NetworkMessage.cc  9 May 2008 20:21:39 -0000       3.32
@@ -16,7 +16,7 @@
 // License along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: NetworkMessage.cc,v 3.31 2008/05/07 15:37:37 erk Exp $
+// $Id: NetworkMessage.cc,v 3.32 2008/05/09 20:21:39 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -35,11 +35,11 @@
 
 // ----------------------------------------------------------------------------
 NetworkMessage::NetworkMessage()
-    : isDated(false), 
-      isLabelled(false), 
-      isTagged(false),     
-      exception(e_NO_EXCEPTION),
-      type(NOT_USED)
+    : exception(e_NO_EXCEPTION),
+      type(NOT_USED),
+      _isDated(false), 
+      _isLabelled(false), 
+      _isTagged(false)
 {
     name               = std::string("NetworkMessage (generic)");
     exceptionReason    = std::string("") ;
@@ -218,4 +218,4 @@
 
 } // namespace certi
 
-// $Id: NetworkMessage.cc,v 3.31 2008/05/07 15:37:37 erk Exp $
+// $Id: NetworkMessage.cc,v 3.32 2008/05/09 20:21:39 erk Exp $

Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.cc,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -b -r3.3 -r3.4
--- libCERTI/NM_Classes.cc      5 May 2008 08:42:54 -0000       3.3
+++ libCERTI/NM_Classes.cc      9 May 2008 20:21:39 -0000       3.4
@@ -387,7 +387,6 @@
        this->name = "MESSAGE_NULL";
        this->type = NetworkMessage::MESSAGE_NULL;
        /* specific field init */
-       //isDated =true;
 }
 NM_Message_Null::~NM_Message_Null() {  
 }
@@ -398,7 +397,6 @@
        this->name = "CREATE_FEDERATION_EXECUTION";
        this->type = NetworkMessage::CREATE_FEDERATION_EXECUTION;
        /* specific field init */
-       //isDated =true;
 }
 NM_Create_Federation_Execution::~NM_Create_Federation_Execution() {    
 }
@@ -423,7 +421,6 @@
        this->name = "DESTROY_FEDERATION_EXECUTION";
        this->type = NetworkMessage::DESTROY_FEDERATION_EXECUTION;    
        /* specific field init */    
-       //isDated =true;
 }
 NM_Destroy_Federation_Execution::~NM_Destroy_Federation_Execution() {
 }
@@ -534,9 +531,6 @@
        this->name = "REGISTER_FEDERATION_SYNCHRONIZATION_POINT";
        this->type = NetworkMessage::REGISTER_FEDERATION_SYNCHRONIZATION_POINT;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
-       //isTagged   = true;
 }
 
NM_Register_Federation_Synchronization_Point::~NM_Register_Federation_Synchronization_Point()
 {
 }
@@ -547,8 +541,6 @@
        this->name = "SYNCHRONIZATION_POINT_REGISTRATION_SUCCEEDED";
        this->type = 
NetworkMessage::SYNCHRONIZATION_POINT_REGISTRATION_SUCCEEDED;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
 }
 
NM_Synchronization_Point_Registration_Succeeded::~NM_Synchronization_Point_Registration_Succeeded()
 {
 }
@@ -559,9 +551,6 @@
        this->name = "ANNOUNCE_SYNCHRONIZATION_POINT";
        this->type = NetworkMessage::ANNOUNCE_SYNCHRONIZATION_POINT;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
-       //isTagged   = true;
 }
 NM_Announce_Synchronization_Point::~NM_Announce_Synchronization_Point() {
 }
@@ -572,8 +561,6 @@
        this->name = "SYNCHRONIZATION_POINT_ACHIEVED";
        this->type = NetworkMessage::SYNCHRONIZATION_POINT_ACHIEVED;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
 }
 NM_Synchronization_Point_Achieved::~NM_Synchronization_Point_Achieved() {
 }
@@ -584,8 +571,6 @@
        this->name = "FEDERATION_SYNCHRONIZED";
        this->type = NetworkMessage::FEDERATION_SYNCHRONIZED;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
 }
 NM_Federation_Synchronized::~NM_Federation_Synchronized() {
 }
@@ -596,7 +581,6 @@
        this->name = "REQUEST_FEDERATION_SAVE";
        this->type = NetworkMessage::REQUEST_FEDERATION_SAVE;
        /* specific field init */
-       //isLabelled = true;
 }
 NM_Request_Federation_Save::~NM_Request_Federation_Save() {
 }
@@ -637,8 +621,6 @@
        this->name = "INITIATE_FEDERATE_SAVE";
        this->type = NetworkMessage::INITIATE_FEDERATE_SAVE;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
 }
 NM_Initiate_Federate_Save::~NM_Initiate_Federate_Save() {
 }
@@ -669,8 +651,6 @@
        this->name = "REQUEST_FEDERATION_RESTORE";
        this->type = NetworkMessage::REQUEST_FEDERATION_RESTORE;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
 }
 NM_Request_Federation_Restore::~NM_Request_Federation_Restore() {
 }
@@ -701,8 +681,6 @@
        this->name = "REQUEST_FEDERATION_RESTORE_SUCCEEDED";
        this->type = NetworkMessage::REQUEST_FEDERATION_RESTORE_SUCCEEDED;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
 }
 
NM_Request_Federation_Restore_Succeeded::~NM_Request_Federation_Restore_Succeeded()
 {
 }
@@ -713,9 +691,6 @@
        this->name = "REQUEST_FEDERATION_RESTORE_FAILED";
        this->type = NetworkMessage::REQUEST_FEDERATION_RESTORE_FAILED;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
-       //isTagged   = true;
 }
 NM_Request_Federation_Restore_Failed::~NM_Request_Federation_Restore_Failed() {
 }
@@ -726,7 +701,6 @@
        this->name = "FEDERATION_RESTORE_BEGUN";
        this->type = NetworkMessage::FEDERATION_RESTORE_BEGUN;
        /* specific field init */
-       //isLabelled = true;
 }
 NM_Federation_Restore_Begun::~NM_Federation_Restore_Begun() {
 }
@@ -909,7 +883,6 @@
        this->name = "REGISTER_OBJECT";
        this->type = NetworkMessage::REGISTER_OBJECT;
        /* specific field init */
-       //isLabelled = true;
 }
 NM_Register_Object::~NM_Register_Object() {
 }
@@ -934,7 +907,6 @@
        this->name = "DISCOVER_OBJECT";
        this->type = NetworkMessage::DISCOVER_OBJECT;
        /* specific field init */
-       //isLabelled = true;
 }
 NM_Discover_Object::~NM_Discover_Object() {
 }
@@ -945,8 +917,6 @@
        this->name = "UPDATE_ATTRIBUTE_VALUES";
        this->type = NetworkMessage::UPDATE_ATTRIBUTE_VALUES;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
 }
 NM_Update_Attribute_Values::~NM_Update_Attribute_Values() {
 }
@@ -994,8 +964,6 @@
        this->name = "SEND_INTERACTION";
        this->type = NetworkMessage::SEND_INTERACTION;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
 }
 NM_Send_Interaction::~NM_Send_Interaction() {
 }
@@ -1041,8 +1009,6 @@
        this->name = "DELETE_OBJECT";
        this->type = NetworkMessage::DELETE_OBJECT;
        /* specific field init */
-       //isDated =true;
-       //isLabelled = true;
 }
 NM_Delete_Object::~NM_Delete_Object() {
 }
@@ -1186,7 +1152,6 @@
        this->name = "IS_ATTRIBUTE_OWNED_BY_FEDERATE";
        this->type = NetworkMessage::IS_ATTRIBUTE_OWNED_BY_FEDERATE;
        /* specific field init */
-       //isLabelled = true;
 }
 NM_Is_Attribute_Owned_By_Federate::~NM_Is_Attribute_Owned_By_Federate() {
 }
@@ -1241,7 +1206,6 @@
        this->name = "NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE";
        this->type = NetworkMessage::NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE;
        /* specific field init */
-       //isLabelled = true;
 }
 
NM_Negotiated_Attribute_Ownership_Divestiture::~NM_Negotiated_Attribute_Ownership_Divestiture()
 {
 }
@@ -1468,7 +1432,6 @@
        this->name = "DDM_REGISTER_OBJECT";
        this->type = NetworkMessage::DDM_REGISTER_OBJECT;
        /* specific field init */
-       //isTagged = true;
 }
 NM_DDM_Register_Object::~NM_DDM_Register_Object() {
 }

Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.37
retrieving revision 3.38
diff -u -b -r3.37 -r3.38
--- RTIA/TimeManagement.cc      7 May 2008 15:37:38 -0000       3.37
+++ RTIA/TimeManagement.cc      9 May 2008 20:21:40 -0000       3.38
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: TimeManagement.cc,v 3.37 2008/05/07 15:37:38 erk Exp $
+// $Id: TimeManagement.cc,v 3.38 2008/05/09 20:21:40 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -178,7 +178,7 @@
       {
           ValueLengthPair *ValueArray = msg.getAttribValueArray();
 
-          if (msg.isDated)
+          if (msg.isDated())
              om->reflectAttributeValues(msg.object,
                                         msg.handleArray,
                                         ValueArray,
@@ -212,7 +212,7 @@
       {
           ParameterLengthPair *ValueArray = msg.getParamValueArray();
 
-          if (msg.isDated)
+          if (msg.isDated())
               om->receiveInteraction(msg.interactionClass,
                                      msg.handleArray,
                                      ValueArray,
@@ -234,7 +234,7 @@
       }
 
       case NetworkMessage::REMOVE_OBJECT:
-          if (msg.isDated) {
+          if (msg.isDated()) {
                om->removeObject(msg.object,
                                     msg.federate,
                                             msg.getDate(),
@@ -932,4 +932,4 @@
 
 }} // namespaces
 
-// $Id: TimeManagement.cc,v 3.37 2008/05/07 15:37:38 erk Exp $
+// $Id: TimeManagement.cc,v 3.38 2008/05/09 20:21:40 erk Exp $

Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.41
retrieving revision 3.42
diff -u -b -r3.41 -r3.42
--- RTIA/ObjectManagement.cc    7 May 2008 15:37:38 -0000       3.41
+++ RTIA/ObjectManagement.cc    9 May 2008 20:21:40 -0000       3.42
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: ObjectManagement.cc,v 3.41 2008/05/07 15:37:38 erk Exp $
+// $Id: ObjectManagement.cc,v 3.42 2008/05/09 20:21:40 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -355,8 +355,6 @@
 
     // Building network message (req) to RTIG.   
     req.interactionClass = theInteraction ;
-    // false for UAV without time
-    req.isDated    = false;
     req.region     = region ;
     req.federation = fm->_numero_federation ;
     req.federate   = fm->federate ;
@@ -814,4 +812,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: ObjectManagement.cc,v 3.41 2008/05/07 15:37:38 erk Exp $
+// $Id: ObjectManagement.cc,v 3.42 2008/05/09 20:21:40 erk Exp $

Index: RTIA/RTIA_network.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_network.cc,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -b -r3.24 -r3.25
--- RTIA/RTIA_network.cc        7 May 2008 15:37:38 -0000       3.24
+++ RTIA/RTIA_network.cc        9 May 2008 20:21:40 -0000       3.25
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: RTIA_network.cc,v 3.24 2008/05/07 15:37:38 erk Exp $
+// $Id: RTIA_network.cc,v 3.25 2008/05/09 20:21:40 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -118,7 +118,7 @@
          // criteria. Otherwise, a single message will be enqueue in FIFO.
  
          // Here we have to consider RAV without time
-         if ( !msg->isDated)
+         if ( !msg->isDated())
              {
              // without time
              updateOrder = RECEIVE ;
@@ -162,7 +162,7 @@
             "Receving Message from RTIG, type 
NetworkMessage::RECEIVE_INTERACTION.");
 
          // Here we have to consider RAV without time
-         if ( !msg->isDated)
+         if ( !msg->isDated())
              {
              // without time
              interactionOrder = RECEIVE ;
@@ -194,7 +194,7 @@
           D.Out(pdTrace, "Receving Message from RTIG, \
                          type NetworkMessage::REMOVE_OBJECT.");
 
-          if (tm->requestContraintState() && msg->isDated) {
+          if (tm->requestContraintState() && msg->isDated()) {
               // Verify that received TSO timestamp is >= current
               // time + lookahead
               queues->insertTsoMessage(msg);
@@ -341,4 +341,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: RTIA_network.cc,v 3.24 2008/05/07 15:37:38 erk Exp $
+// $Id: RTIA_network.cc,v 3.25 2008/05/09 20:21:40 erk Exp $

Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.66
retrieving revision 3.67
diff -u -b -r3.66 -r3.67
--- RTIG/RTIG_processing.cc     29 Apr 2008 09:38:33 -0000      3.66
+++ RTIG/RTIG_processing.cc     9 May 2008 20:21:40 -0000       3.67
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: RTIG_processing.cc,v 3.66 2008/04/29 09:38:33 erk Exp $
+// $Id: RTIG_processing.cc,v 3.67 2008/05/09 20:21:40 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -765,7 +765,7 @@
     ValueArray = req->getAttribValueArray();
 
     // Forward the call
-    if ( req->isDated )
+    if ( req->isDated() )
         {
         // UAV with time
         federations.updateAttribute(req->federation,
@@ -818,7 +818,7 @@
                << ", date = " << req->getDate() ;
     values = req->getParamValueArray();
 
-    if ( req->isDated )
+    if ( req->isDated() )
         {
         federations.updateParameter(req->federation,
                                req->federate,
@@ -870,7 +870,7 @@
     G.Out(pdGendoc,"enter RTIG::processDeleteObject");
     auditServer << "ObjID = %u" << req->object ;
 
-    if ( req->isDated ) {
+    if ( req->isDated() ) {
        federations.destroyObject(req->federation,
                                  req->federate,
                                   req->object,
@@ -1394,4 +1394,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.66 2008/04/29 09:38:33 erk Exp $
+// $Id: RTIG_processing.cc,v 3.67 2008/05/09 20:21:40 erk Exp $




reply via email to

[Prev in Thread] Current Thread [Next in Thread]