[certi-cvs] certi/libCERTI Object.cc Named.cc Object.hh Nam...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      09/10/11 14:55:01

Modified files:
        libCERTI       : Object.cc Named.cc Object.hh Named.hh 

Log message:
        Merge-in (partially)
        patch #6942: remove nused/duplicate attributes, avoid linesar searches 
on instance attributes
        Partially: we cannot assume that AttributeHandle goes from 0 linearly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Object.cc?cvsroot=certi&r1=3.24&r2=3.25
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Named.cc?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Object.hh?cvsroot=certi&r1=3.20&r2=3.21
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Named.hh?cvsroot=certi&r1=3.8&r2=3.9

Patches:
Index: Object.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Object.cc,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -b -r3.24 -r3.25
--- Object.cc   24 Sep 2008 12:53:11 -0000      3.24
+++ Object.cc   11 Oct 2009 14:55:01 -0000      3.25
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Object.cc,v 3.24 2008/09/24 12:53:11 erk Exp $
+// $Id: Object.cc,v 3.25 2009/10/11 14:55:01 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -59,7 +59,6 @@
 //! Destructor.
 Object::~Object()
 {
-    sf.clear();
     // We should delete the pointee because it belongs to the object.
     for (std::deque<ObjectAttribute *>::iterator i = attributeState.begin(); 
i!=attributeState.end();++i) {
        delete (*i);
@@ -160,4 +159,4 @@
 
 } // namespace certi
 
-// $Id: Object.cc,v 3.24 2008/09/24 12:53:11 erk Exp $
+// $Id: Object.cc,v 3.25 2009/10/11 14:55:01 erk Exp $

Index: Named.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Named.cc,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- Named.cc    8 Nov 2008 00:59:38 -0000       3.8
+++ Named.cc    11 Oct 2009 14:55:01 -0000      3.9
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Named.cc,v 3.8 2008/11/08 00:59:38 erk Exp $
+// $Id: Named.cc,v 3.9 2009/10/11 14:55:01 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include "Named.hh"
@@ -28,13 +28,13 @@
 
 Named::Named() { }
 
-Named::Named(std::string newName)
+Named::Named(const std::string& newName)
     : name(newName) { }
 
 Named::~Named() {}
 
 void
-Named::setName(std::string newName)
+Named::setName(const std::string& newName)
 {
     name = newName ;
 }
@@ -103,4 +103,4 @@
 
 } // certi
 
-// $Id: Named.cc,v 3.8 2008/11/08 00:59:38 erk Exp $
+// $Id: Named.cc,v 3.9 2009/10/11 14:55:01 erk Exp $

Index: Object.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Object.hh,v
retrieving revision 3.20
retrieving revision 3.21
diff -u -b -r3.20 -r3.21
--- Object.hh   7 Dec 2008 20:16:14 -0000       3.20
+++ Object.hh   11 Oct 2009 14:55:01 -0000      3.21
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Object.hh,v 3.20 2008/12/07 20:16:14 gotthardp Exp $
+// $Id: Object.hh,v 3.21 2009/10/11 14:55:01 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef _CERTI_OBJECT_HH
@@ -45,7 +45,7 @@
 {
 public:
     Object(FederateHandle the_owner)
-        : Owner(the_owner), name("") { handle = 0 ; };
+        : Owner(the_owner) { handle = 0 ; };
 
     Object(FederateHandle the_owner, const char *the_name);
 
@@ -82,16 +82,10 @@
 
     ObjectHandle handle ; //!< Object Instance ID
     ObjectClassHandle classHandle ; //! Object Class
-    ObjectName_t name ; //!< Instance name.
-
-    /*! federate list subscribed to this class and with subscription region
-      intersect with UR.
-    */
-    std::list<FederateHandle *> sf ;
 };
 
 }
 
 #endif // _CERTI_OBJECT_HH
 
-// $Id: Object.hh,v 3.20 2008/12/07 20:16:14 gotthardp Exp $
+// $Id: Object.hh,v 3.21 2009/10/11 14:55:01 erk Exp $

Index: Named.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Named.hh,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- Named.hh    8 Nov 2008 00:59:38 -0000       3.8
+++ Named.hh    11 Oct 2009 14:55:01 -0000      3.9
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Named.hh,v 3.8 2008/11/08 00:59:38 erk Exp $
+// $Id: Named.hh,v 3.9 2009/10/11 14:55:01 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef LIBCERTI_NAMED_HH
@@ -51,7 +51,7 @@
      * Constructor with inital value.
      * @param[in] name Initial name
      */
-    Named(const std::string newName);
+    Named(const std::string& newName);
 
     /**
      * Virtual destructor.
@@ -63,7 +63,7 @@
      *  Set name.
      *  @param[in] name the new name
      */
-    virtual void setName(const std::string newName);
+    virtual void setName(const std::string& newName);
 
     /**
      *  Set name (char* version)
@@ -142,4 +142,4 @@
 
 #endif // LIBCERTI_NAMED_HH
 
-// $Id: Named.hh,v 3.8 2008/11/08 00:59:38 erk Exp $
+// $Id: Named.hh,v 3.9 2009/10/11 14:55:01 erk Exp $