[certi-cvs] certi/RTIA ObjectManagement.cc ObjectManagement.hh

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Petr Gotthard <gotthardp>       08/10/10 15:41:11

Modified files:
        RTIA           : ObjectManagement.cc ObjectManagement.hh 

Log message:
        Make the TransportTypeList/OrderTypeList private.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.53&r2=3.54
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.hh?cvsroot=certi&r1=3.26&r2=3.27

Patches:
Index: ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.53
retrieving revision 3.54
diff -u -b -r3.53 -r3.54
--- ObjectManagement.cc 10 Oct 2008 14:04:47 -0000      3.53
+++ ObjectManagement.cc 10 Oct 2008 15:41:10 -0000      3.54
@@ -52,6 +52,20 @@
 static PrettyDebug D("RTIA_OM", __FILE__);
 static PrettyDebug G("GENDOC",__FILE__);
 
+const ObjectManagement::TransportTypeList
+ObjectManagement::transportTypeList[] = {
+    { "HLAreliable", RELIABLE },
+    { "HLAbestEffort", BEST_EFFORT },
+    { NULL }
+};
+
+const ObjectManagement::OrderTypeList
+ObjectManagement::orderTypeList[] = {
+    { "Receive", RECEIVE },
+    { "Timestamp", TIMESTAMP },
+    { NULL }
+};
+
 ObjectManagement::ObjectManagement(Communications *GC,
                                    FederationManagement *GF,
                                    RootObject *theRootObj)
@@ -844,13 +858,6 @@
     throw NameNotFound(theName);
 }
 
-const ObjectManagement::TransportTypeList
-ObjectManagement::transportTypeList[] = {
-    { "HLAreliable", RELIABLE },
-    { "HLAbestEffort", BEST_EFFORT },
-    { NULL }
-};
-
 // ----------------------------------------------------------------------------
 //! getTransportationName
 const char *
@@ -877,13 +884,6 @@
     throw NameNotFound(theName);
 }
 
-const ObjectManagement::OrderTypeList
-ObjectManagement::orderTypeList[] = {
-    { "Receive", RECEIVE },
-    { "Timestamp", TIMESTAMP },
-    { NULL }
-};
-
 // ----------------------------------------------------------------------------
 //! getOrderingName
 const char *

Index: ObjectManagement.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.hh,v
retrieving revision 3.26
retrieving revision 3.27
diff -u -b -r3.26 -r3.27
--- ObjectManagement.hh 10 Oct 2008 14:04:48 -0000      3.26
+++ ObjectManagement.hh 10 Oct 2008 15:41:11 -0000      3.27
@@ -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.hh,v 3.26 2008/10/10 14:04:48 gotthardp Exp $
+// $Id: ObjectManagement.hh,v 3.27 2008/10/10 15:41:11 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef _CERTI_RTIA_OM
@@ -249,21 +249,9 @@
 
     ObjectClassHandle getObjectClass(ObjectHandle);
 
-    struct TransportTypeList {
-        const char *name;
-        TransportType type;
-    };
-    static const TransportTypeList transportTypeList[];
-
     TransportType getTransportationHandle(const char *theName);
     const char *getTransportationName(TransportType theType);
 
-    struct OrderTypeList {
-        const char *name;
-        OrderType type;
-    };
-    static const OrderTypeList orderTypeList[];
-
     OrderType getOrderingHandle(const char *theName);
     const char *getOrderingName(OrderType theType);
 
@@ -275,10 +263,22 @@
     FederationManagement *fm ;
     RootObject *rootObject ;
 
+private:
+    struct TransportTypeList {
+        const char *name;
+        TransportType type;
+    };
+    static const TransportTypeList transportTypeList[];
+
+    struct OrderTypeList {
+        const char *name;
+        OrderType type;
+    };
+    static const OrderTypeList orderTypeList[];
 };
 
 }} // namespace certi/rtia
 
 #endif // _CERTI_RTIA_OM
 
-// $Id: ObjectManagement.hh,v 3.26 2008/10/10 14:04:48 gotthardp Exp $
+// $Id: ObjectManagement.hh,v 3.27 2008/10/10 15:41:11 gotthardp Exp $