[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/Object.hh libCERTI/Object.cc RTI...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libCERTI/Object.hh libCERTI/Object.cc RTI... |
|
Date: |
Thu, 18 Sep 2008 17:13:33 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 08/09/18 17:13:33
Modified files:
libCERTI : Object.hh Object.cc
RTIG : FederationsList.hh FederationsList.cc
include : certi.hh
Log message:
One char* type less :=)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Object.hh?cvsroot=certi&r1=3.18&r2=3.19
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Object.cc?cvsroot=certi&r1=3.22&r2=3.23
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/FederationsList.hh?cvsroot=certi&r1=3.44&r2=3.45
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/FederationsList.cc?cvsroot=certi&r1=3.59&r2=3.60
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.33&r2=3.34
Patches:
Index: libCERTI/Object.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Object.hh,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -b -r3.18 -r3.19
--- libCERTI/Object.hh 9 Dec 2007 16:26:49 -0000 3.18
+++ libCERTI/Object.hh 18 Sep 2008 17:13:32 -0000 3.19
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Object.hh,v 3.18 2007/12/09 16:26:49 erk Exp $
+// $Id: Object.hh,v 3.19 2008/09/18 17:13:32 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_OBJECT_HH
@@ -44,7 +44,7 @@
{
public:
Object(FederateHandle the_owner)
- : Owner(the_owner), name(NULL) { handle = 0 ; };
+ : Owner(the_owner), name("") { handle = 0 ; };
Object(FederateHandle the_owner, const char *the_name);
@@ -81,7 +81,7 @@
ObjectHandle handle ; //!< Object Instance ID
ObjectClassHandle classHandle ; //! Object Class
- ObjectName name ; //!< Instance name.
+ ObjectName_t name ; //!< Instance name.
/*! federate list subscribed to this class and with subscription region
intersect with UR.
@@ -93,4 +93,4 @@
#endif // _CERTI_OBJECT_HH
-// $Id: Object.hh,v 3.18 2007/12/09 16:26:49 erk Exp $
+// $Id: Object.hh,v 3.19 2008/09/18 17:13:32 erk Exp $
Index: libCERTI/Object.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Object.cc,v
retrieving revision 3.22
retrieving revision 3.23
diff -u -b -r3.22 -r3.23
--- libCERTI/Object.cc 13 Jun 2008 10:55:13 -0000 3.22
+++ libCERTI/Object.cc 18 Sep 2008 17:13:32 -0000 3.23
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Object.cc,v 3.22 2008/06/13 10:55:13 erk Exp $
+// $Id: Object.cc,v 3.23 2008/09/18 17:13:32 erk Exp $
// ----------------------------------------------------------------------------
@@ -51,11 +51,6 @@
//! Destructor.
Object::~Object()
{
- if (name != NULL) {
- free(name);
- name = NULL ;
- }
-
sf.clear();
attributeState.clear();
}
@@ -67,7 +62,7 @@
{
cout << " Instance: handle =" << handle ;
- if (name != NULL)
+ if (name.length() > 0)
cout << ", name=\"" << name << "\"" << endl ;
else
cout << ", (No name)." << endl ;
@@ -153,4 +148,4 @@
} // namespace certi
-// $Id: Object.cc,v 3.22 2008/06/13 10:55:13 erk Exp $
+// $Id: Object.cc,v 3.23 2008/09/18 17:13:32 erk Exp $
Index: RTIG/FederationsList.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/FederationsList.hh,v
retrieving revision 3.44
retrieving revision 3.45
diff -u -b -r3.44 -r3.45
--- RTIG/FederationsList.hh 18 Sep 2008 14:41:27 -0000 3.44
+++ RTIG/FederationsList.hh 18 Sep 2008 17:13:33 -0000 3.45
@@ -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.44 2008/09/18 14:41:27 gotthardp Exp $
+// $Id: FederationsList.hh,v 3.45 2008/09/18 17:13:33 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIG_FEDERATIONS_LIST_HH
@@ -249,7 +249,7 @@
ObjectHandle registerObject(Handle theHandle,
FederateHandle theFederateHandle,
ObjectClassHandle theClass,
- ObjectName theName)
+ ObjectName_t theName)
throw (FederateNotExecutionMember,
FederateNotPublishing,
ObjectAlreadyRegistered,
@@ -562,7 +562,7 @@
RTIinternalError);
ObjectHandle registerObjectWithRegion(Handle, FederateHandle,
- ObjectClassHandle, ObjectName,
+ ObjectClassHandle, ObjectName_t,
RegionHandle, int, std::vector
<AttributeHandle> &)
throw (ObjectClassNotDefined, ObjectClassNotPublished,
AttributeNotDefined, AttributeNotPublished, RegionNotKnown,
@@ -585,4 +585,4 @@
#endif // _CERTI_RTIG_FEDERATIONS_LIST_HH
-// $Id: FederationsList.hh,v 3.44 2008/09/18 14:41:27 gotthardp Exp $
+// $Id: FederationsList.hh,v 3.45 2008/09/18 17:13:33 erk Exp $
Index: RTIG/FederationsList.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/FederationsList.cc,v
retrieving revision 3.59
retrieving revision 3.60
diff -u -b -r3.59 -r3.60
--- RTIG/FederationsList.cc 18 Sep 2008 14:41:27 -0000 3.59
+++ RTIG/FederationsList.cc 18 Sep 2008 17:13:33 -0000 3.60
@@ -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.cc,v 3.59 2008/09/18 14:41:27 gotthardp Exp $
+// $Id: FederationsList.cc,v 3.60 2008/09/18 17:13:33 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -370,7 +370,7 @@
FederationsList::registerObject(Handle handle,
FederateHandle federate,
ObjectClassHandle object_class,
- ObjectName name)
+ ObjectName_t name)
throw (FederateNotExecutionMember,
FederateNotPublishing,
ObjectAlreadyRegistered,
@@ -390,8 +390,8 @@
// It may throw FederationExecutionDoesNotExist.
searchFederation(handle, federation);
- D.Out(pdTrace, "theObjectClass = %d, name = %s.", object_class, name);
- return(federation->registerObject(federate, object_class, name));
+ D.Out(pdTrace, "theObjectClass = %d, name = %s.", object_class,
name.c_str());
+ return(federation->registerObject(federate, object_class, name.c_str()));
}
// ----------------------------------------------------------------------------
@@ -1399,7 +1399,7 @@
ObjectHandle FederationsList::registerObjectWithRegion(Handle federation,
FederateHandle federate,
ObjectClassHandle handle,
- ObjectName tag,
+ ObjectName_t tag,
RegionHandle region,
int nb,
std::vector
<AttributeHandle> &attrs)
@@ -1415,7 +1415,7 @@
checkHandle(federation);
checkHandle(federate);
- return f->registerObjectWithRegion(federate, handle, tag, region, nb,
attrs);
+ return f->registerObjectWithRegion(federate, handle, tag.c_str(), region,
nb, attrs);
}
// ----------------------------------------------------------------------------
@@ -1558,5 +1558,5 @@
}} // certi::rtig
-// EOF $Id: FederationsList.cc,v 3.59 2008/09/18 14:41:27 gotthardp Exp $
+// EOF $Id: FederationsList.cc,v 3.60 2008/09/18 17:13:33 erk Exp $
Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.33
retrieving revision 3.34
diff -u -b -r3.33 -r3.34
--- include/certi.hh 18 Sep 2008 14:41:28 -0000 3.33
+++ include/certi.hh 18 Sep 2008 17:13:33 -0000 3.34
@@ -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: certi.hh,v 3.33 2008/09/18 14:41:28 gotthardp Exp $
+// $Id: certi.hh,v 3.34 2008/09/18 17:13:33 erk Exp $
// ----------------------------------------------------------------------------
#include <vector>
@@ -226,7 +226,7 @@
typedef RTI::Double FederationTime ;
typedef UShort ObjectHandlecount ;
-typedef char *ObjectName ;
+typedef std::string ObjectName_t ;
typedef char *ParameterName ;
typedef std::string AttributeValue_t;
typedef std::string ParameterValue_t;
@@ -353,4 +353,4 @@
(uint64_t) CERTI_INT64_CONSTANT(0xff00000000000000U)) >> 56)))
#endif // CERTI_HH_INCLUDED
-// $Id: certi.hh,v 3.33 2008/09/18 14:41:28 gotthardp Exp $
+// $Id: certi.hh,v 3.34 2008/09/18 17:13:33 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libCERTI/Object.hh libCERTI/Object.cc RTI...,
certi-cvs <=