[certi-cvs] certi RTIG/Federation.cc RTIG/Federation.hh RTI...

certi-cvs
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIG/Federation.cc RTIG/Federation.hh RTI...

From:	certi-cvs
Subject:	[certi-cvs] certi RTIG/Federation.cc RTIG/Federation.hh RTI...
Date:	Sun, 09 Nov 2008 12:41:41 +0000
CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Petr Gotthard <gotthardp>       08/11/09 12:41:40

Modified files:
        RTIG           : Federation.cc Federation.hh FederationsList.hh 
        libCERTI       : Interaction.cc Interaction.hh 
                         ObjectClassAttribute.cc ObjectClassAttribute.hh 
                         TreeNamedAndHandledSet.hh 

Log message:
        Sun Studio portability: renamed some variables to avoid compiler 
warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.99&r2=3.100
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.hh?cvsroot=certi&r1=3.52&r2=3.53
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/FederationsList.hh?cvsroot=certi&r1=3.46&r2=3.47
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.cc?cvsroot=certi&r1=3.50&r2=3.51
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.hh?cvsroot=certi&r1=3.35&r2=3.36
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassAttribute.cc?cvsroot=certi&r1=3.29&r2=3.30
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassAttribute.hh?cvsroot=certi&r1=3.24&r2=3.25
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/TreeNamedAndHandledSet.hh?cvsroot=certi&r1=1.5&r2=1.6

Patches:
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.99
retrieving revision 3.100
diff -u -b -r3.99 -r3.100
--- RTIG/Federation.cc  30 Oct 2008 10:57:55 -0000      3.99
+++ RTIG/Federation.cc  9 Nov 2008 12:41:39 -0000       3.100
@@ -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: Federation.cc,v 3.99 2008/10/30 10:57:55 erk Exp $
+// $Id: Federation.cc,v 3.100 2008/11/09 12:41:39 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -106,7 +106,7 @@
                        SocketServer &socket_server,
                        AuditFile &audit_server,
                        SocketMC *mc_link,
-                       int verboseLevel)
+                       int theVerboseLevel)
 #else
 /** with FEDERATION_USES_MULTICAST not defined
     @param federation_name
@@ -120,13 +120,13 @@
                            SocketServer &socket_server,
                            AuditFile &audit_server,
                            const char *FEDid_name,
-                           int verboseLevel)
+                           int theVerboseLevel)
 #endif
     throw (CouldNotOpenFED, ErrorReadingFED, MemoryExhausted, SecurityError,
            RTIinternalError)
     : federateHandles(1), objectHandles(1), saveInProgress(false),
       restoreInProgress(false), saveStatus(true), restoreStatus(true),
-      verboseLevel(verboseLevel)
+      verboseLevel(theVerboseLevel)
 
 {
     //    fedparser::FedParser *fed_reader ;
@@ -2316,5 +2316,5 @@
 
 }} // namespace certi/rtig
 
-// $Id: Federation.cc,v 3.99 2008/10/30 10:57:55 erk Exp $
+// $Id: Federation.cc,v 3.100 2008/11/09 12:41:39 gotthardp Exp $
 

Index: RTIG/Federation.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.hh,v
retrieving revision 3.52
retrieving revision 3.53
diff -u -b -r3.52 -r3.53
--- RTIG/Federation.hh  30 Oct 2008 10:49:27 -0000      3.52
+++ RTIG/Federation.hh  9 Nov 2008 12:41:39 -0000       3.53
@@ -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: Federation.hh,v 3.52 2008/10/30 10:49:27 erk Exp $
+// $Id: Federation.hh,v 3.53 2008/11/09 12:41:39 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef _CERTI_RTIG_FEDERATION_HH
@@ -87,9 +87,9 @@
                SocketServer &,
                AuditFile &,
                SocketMC*,
-               int verboseLevel)
+               int theVerboseLevel)
 #else
-        Federation(const char *, Handle, SocketServer &, AuditFile &, const 
char *,int verboseLevel)
+        Federation(const char *, Handle, SocketServer &, AuditFile &, const 
char *, int theVerboseLevel)
 #endif
         throw (CouldNotOpenFED, ErrorReadingFED, MemoryExhausted, 
SecurityError,
                RTIinternalError);
@@ -598,4 +598,4 @@
 
 #endif // _CERTI_RTIG_FEDERATION_HH
 
-// $Id: Federation.hh,v 3.52 2008/10/30 10:49:27 erk Exp $
+// $Id: Federation.hh,v 3.53 2008/11/09 12:41:39 gotthardp Exp $

Index: RTIG/FederationsList.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/FederationsList.hh,v
retrieving revision 3.46
retrieving revision 3.47
diff -u -b -r3.46 -r3.47
--- RTIG/FederationsList.hh     30 Oct 2008 10:49:27 -0000      3.46
+++ RTIG/FederationsList.hh     9 Nov 2008 12:41:40 -0000       3.47
@@ -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: FederationsList.hh,v 3.46 2008/10/30 10:49:27 erk Exp $
+// $Id: FederationsList.hh,v 3.47 2008/11/09 12:41:40 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef _CERTI_RTIG_FEDERATIONS_LIST_HH
@@ -570,7 +570,7 @@
               FederateNotExecutionMember, SaveInProgress, RestoreInProgress,
               RTIinternalError);
 
-    void setVerboseLevel(int verboseLevel) { this->verboseLevel = verboseLevel 
; }
+    void setVerboseLevel(int theVerboseLevel) { this->verboseLevel = 
theVerboseLevel ; }
 
 private:
     // Private methods
@@ -585,4 +585,4 @@
 
 #endif // _CERTI_RTIG_FEDERATIONS_LIST_HH
 
-// $Id: FederationsList.hh,v 3.46 2008/10/30 10:49:27 erk Exp $
+// $Id: FederationsList.hh,v 3.47 2008/11/09 12:41:40 gotthardp Exp $

Index: libCERTI/Interaction.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.cc,v
retrieving revision 3.50
retrieving revision 3.51
diff -u -b -r3.50 -r3.51
--- libCERTI/Interaction.cc     8 Nov 2008 11:08:03 -0000       3.50
+++ libCERTI/Interaction.cc     9 Nov 2008 12:41:40 -0000       3.51
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Interaction.cc,v 3.50 2008/11/08 11:08:03 erk Exp $
+// $Id: Interaction.cc,v 3.51 2008/11/09 12:41:40 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -43,11 +43,11 @@
 static pdCDebug D("INTERACTION", "(Interact) - ");
 static PrettyDebug G("GENDOC",__FILE__) ;
 
-Interaction::Interaction(const std::string& name, InteractionClassHandle 
handle, TransportType transport, OrderType order)
-: parent(0), depth(0), transport(transport), order(order), handle(handle),
+Interaction::Interaction(const std::string& theName, InteractionClassHandle 
theHandle, TransportType theTransport, OrderType theOrder)
+: parent(0), depth(0), transport(theTransport), order(theOrder), 
handle(theHandle),
 id(PublicLevelID)
 {
-       setName(name);
+       setName(theName);
        /*
         * The set of interaction subclass has no security server
         */
@@ -547,4 +547,4 @@
 
 } // namespace certi
 
-// $Id: Interaction.cc,v 3.50 2008/11/08 11:08:03 erk Exp $
+// $Id: Interaction.cc,v 3.51 2008/11/09 12:41:40 gotthardp Exp $

Index: libCERTI/Interaction.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.hh,v
retrieving revision 3.35
retrieving revision 3.36
diff -u -b -r3.35 -r3.36
--- libCERTI/Interaction.hh     8 Nov 2008 11:08:03 -0000       3.35
+++ libCERTI/Interaction.hh     9 Nov 2008 12:41:40 -0000       3.36
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Interaction.hh,v 3.35 2008/11/08 11:08:03 erk Exp $
+// $Id: Interaction.hh,v 3.36 2008/11/09 12:41:40 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef _CERTI_INTERACTION_HH
@@ -70,7 +70,7 @@
         * @param[in] transport the transport type
         * @param[in] order the receive order type
         */
-    Interaction(const std::string& name, InteractionClassHandle handle, 
TransportType transport, OrderType order);
+    Interaction(const std::string& theName, InteractionClassHandle theHandle, 
TransportType theTransport, OrderType theOrder);
     /**
      * Destructor.
      */
@@ -246,4 +246,4 @@
 
 #endif // _CERTI_INTERACTION.HH
 
-// $Id: Interaction.hh,v 3.35 2008/11/08 11:08:03 erk Exp $
+// $Id: Interaction.hh,v 3.36 2008/11/09 12:41:40 gotthardp Exp $

Index: libCERTI/ObjectClassAttribute.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassAttribute.cc,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -b -r3.29 -r3.30
--- libCERTI/ObjectClassAttribute.cc    30 Oct 2008 16:01:38 -0000      3.29
+++ libCERTI/ObjectClassAttribute.cc    9 Nov 2008 12:41:40 -0000       3.30
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: ObjectClassAttribute.cc,v 3.29 2008/10/30 16:01:38 erk Exp $
+// $Id: ObjectClassAttribute.cc,v 3.30 2008/11/09 12:41:40 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #include "ObjectClassAttribute.hh"
@@ -40,9 +40,9 @@
 
 static pdCDebug D("OBJECTCLASSATTRIBUTE", "(Obj.Cl.Attr) ");
 
-ObjectClassAttribute::ObjectClassAttribute(const std::string name, 
TransportType transport, OrderType order)
- : order(order), transport(transport) {
-       setName(name);
+ObjectClassAttribute::ObjectClassAttribute(const std::string theName, 
TransportType theTransport, OrderType theOrder)
+ : order(theOrder), transport(theTransport) {
+       setName(theName);
 
 }
 // ----------------------------------------------------------------------------
@@ -214,4 +214,4 @@
 
 } // namespace
 
-// $Id: ObjectClassAttribute.cc,v 3.29 2008/10/30 16:01:38 erk Exp $
+// $Id: ObjectClassAttribute.cc,v 3.30 2008/11/09 12:41:40 gotthardp Exp $

Index: libCERTI/ObjectClassAttribute.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassAttribute.hh,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -b -r3.24 -r3.25
--- libCERTI/ObjectClassAttribute.hh    30 Oct 2008 16:01:38 -0000      3.24
+++ libCERTI/ObjectClassAttribute.hh    9 Nov 2008 12:41:40 -0000       3.25
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: ObjectClassAttribute.hh,v 3.24 2008/10/30 16:01:38 erk Exp $
+// $Id: ObjectClassAttribute.hh,v 3.25 2008/11/09 12:41:40 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_OBJECT_CLASS_ATTRIBUTE_HH
@@ -48,7 +48,7 @@
 class CERTI_EXPORT ObjectClassAttribute : public Subscribable {
 
 public:
-       ObjectClassAttribute(const std::string name, TransportType transport, 
OrderType order);
+    ObjectClassAttribute(const std::string theName, TransportType 
theTransport, OrderType theOrder);
     ObjectClassAttribute(ObjectClassAttribute *source);
     virtual ~ObjectClassAttribute();
 
@@ -98,4 +98,4 @@
 
 #endif // CERTI_OBJECT_CLASS_ATTRIBUTE_HH
 
-// $Id: ObjectClassAttribute.hh,v 3.24 2008/10/30 16:01:38 erk Exp $
+// $Id: ObjectClassAttribute.hh,v 3.25 2008/11/09 12:41:40 gotthardp Exp $

Index: libCERTI/TreeNamedAndHandledSet.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/TreeNamedAndHandledSet.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libCERTI/TreeNamedAndHandledSet.hh  8 Nov 2008 11:08:03 -0000       1.5
+++ libCERTI/TreeNamedAndHandledSet.hh  9 Nov 2008 12:41:40 -0000       1.6
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: TreeNamedAndHandledSet.hh,v 1.5 2008/11/08 11:08:03 erk Exp $
+// $Id: TreeNamedAndHandledSet.hh,v 1.6 2008/11/09 12:41:40 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef _TreeNamedAndHandledSet_HH
@@ -175,9 +175,9 @@
 };
 
 template <typename ObjectType>
-TreeNamedAndHandledSet<ObjectType>::TreeNamedAndHandledSet(std::string 
setName, bool isRootSet) {
-   this->isRootSet = isRootSet;
-   this->setName   = setName;
+TreeNamedAndHandledSet<ObjectType>::TreeNamedAndHandledSet(std::string 
theSetName, bool theIsRootSet) {
+   this->setName   = theSetName;
+   this->isRootSet = theIsRootSet;
 } /* end of TreeNamedAndHandledSet (constructor) */
 
 template <typename ObjectType>
[Prev in Thread]
Current Thread
[Next in Thread]
[certi-cvs] certi RTIG/Federation.cc RTIG/Federation.hh RTI..., certi-cvs <=
Prev by Date: [certi-cvs] certi libCERTI/ObjectClassSet.hh libCERTI/Objec...
Next by Date: [certi-cvs] applications/HLA_TestsSuite dtest_test_FOMParse.py
Previous by thread: [certi-cvs] certi libCERTI/ObjectClassSet.hh libCERTI/Objec...
Next by thread: [certi-cvs] certi doc/certi_user_doc.tree doc/certi_install...
Index(es):
- Date
- Thread