[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/RootObject.hh libCERTI/ObjectCla...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libCERTI/RootObject.hh libCERTI/ObjectCla... |
|
Date: |
Fri, 13 Jun 2008 10:55:14 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 08/06/13 10:55:14
Modified files:
libCERTI : RootObject.hh ObjectClass.cc Object.cc
RTIA : RTIA.cc RTIA_federate.cc Communications.cc
Log message:
Fix some memleak.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/RootObject.hh?cvsroot=certi&r1=3.28&r2=3.29
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&r1=3.49&r2=3.50
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Object.cc?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA.cc?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.83&r2=3.84
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Communications.cc?cvsroot=certi&r1=3.29&r2=3.30
Patches:
Index: libCERTI/RootObject.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/RootObject.hh,v
retrieving revision 3.28
retrieving revision 3.29
diff -u -b -r3.28 -r3.29
--- libCERTI/RootObject.hh 29 May 2008 12:20:39 -0000 3.28
+++ libCERTI/RootObject.hh 13 Jun 2008 10:55:13 -0000 3.29
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RootObject.hh,v 3.28 2008/05/29 12:20:39 rousse Exp $
+// $Id: RootObject.hh,v 3.29 2008/06/13 10:55:13 erk Exp $
// ----------------------------------------------------------------------------
#ifndef LIBCERTI_ROOT_OBJECT
@@ -126,4 +126,4 @@
#endif // LIBCERTI_ROOT_OBJECT
-// $Id: RootObject.hh,v 3.28 2008/05/29 12:20:39 rousse Exp $
+// $Id: RootObject.hh,v 3.29 2008/06/13 10:55:13 erk Exp $
Index: libCERTI/ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.49
retrieving revision 3.50
diff -u -b -r3.49 -r3.50
--- libCERTI/ObjectClass.cc 12 Jun 2008 07:39:48 -0000 3.49
+++ libCERTI/ObjectClass.cc 13 Jun 2008 10:55:13 -0000 3.50
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.cc,v 3.49 2008/06/12 07:39:48 erk Exp $
+// $Id: ObjectClass.cc,v 3.50 2008/06/13 10:55:13 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -1824,4 +1824,4 @@
} // namespace certi
-// $Id: ObjectClass.cc,v 3.49 2008/06/12 07:39:48 erk Exp $
+// $Id: ObjectClass.cc,v 3.50 2008/06/13 10:55:13 erk Exp $
Index: libCERTI/Object.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Object.cc,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- libCERTI/Object.cc 31 Oct 2007 10:30:21 -0000 3.21
+++ libCERTI/Object.cc 13 Jun 2008 10:55:13 -0000 3.22
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Object.cc,v 3.21 2007/10/31 10:30:21 erk Exp $
+// $Id: Object.cc,v 3.22 2008/06/13 10:55:13 erk Exp $
// ----------------------------------------------------------------------------
@@ -56,10 +56,8 @@
name = NULL ;
}
- while (!sf.empty()) {
- delete sf.front();
- sf.pop_front();
- }
+ sf.clear();
+ attributeState.clear();
}
// ----------------------------------------------------------------------------
@@ -155,4 +153,4 @@
} // namespace certi
-// $Id: Object.cc,v 3.21 2007/10/31 10:30:21 erk Exp $
+// $Id: Object.cc,v 3.22 2008/06/13 10:55:13 erk Exp $
Index: RTIA/RTIA.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA.cc,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- RTIA/RTIA.cc 29 May 2008 12:20:34 -0000 3.21
+++ RTIA/RTIA.cc 13 Jun 2008 10:55:13 -0000 3.22
@@ -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.cc,v 3.21 2008/05/29 12:20:34 rousse Exp $
+// $Id: RTIA.cc,v 3.22 2008/06/13 10:55:13 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -82,13 +82,16 @@
fm->_FEDid[0] = '\0' ;
}
}
+
+ /* delete objects in reverse order just like generated destructor would
have done */
+ delete ddm ;
delete tm ;
delete dm ;
+ delete owm ;
delete om ;
delete fm ;
delete queues ;
delete comm ;
- delete ddm ;
delete rootObject ;
}
@@ -197,4 +200,4 @@
}} // namespace certi/rtia
-// $Id: RTIA.cc,v 3.21 2008/05/29 12:20:34 rousse Exp $
+// $Id: RTIA.cc,v 3.22 2008/06/13 10:55:13 erk Exp $
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.83
retrieving revision 3.84
diff -u -b -r3.83 -r3.84
--- RTIA/RTIA_federate.cc 11 Jun 2008 15:19:19 -0000 3.83
+++ RTIA/RTIA_federate.cc 13 Jun 2008 10:55:13 -0000 3.84
@@ -192,8 +192,8 @@
else
throw CouldNotOpenFED("nor .fed nor .xml");
- ifstream *fdd = new ifstream(filename.c_str());
- if (fdd->is_open())
+ ifstream fdd(filename.c_str());
+ if (fdd.is_open())
{
if ( is_a_fed )
{
@@ -205,10 +205,8 @@
{
if (XmlParser::exists())
{
- XmlParser *parser = new XmlParser(rootObject);
- parser->parse(filename);
- delete fdd ;
- delete parser ;
+ XmlParser parser(rootObject);
+ parser.parse(filename);
}
else
throw CouldNotOpenFED("no XmlParser");
Index: RTIA/Communications.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/Communications.cc,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -b -r3.29 -r3.30
--- RTIA/Communications.cc 12 Jun 2008 07:39:51 -0000 3.29
+++ RTIA/Communications.cc 13 Jun 2008 10:55:14 -0000 3.30
@@ -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: Communications.cc,v 3.29 2008/06/12 07:39:51 erk Exp $
+// $Id: Communications.cc,v 3.30 2008/06/13 10:55:14 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -101,18 +101,17 @@
// RTIG TCP link creation.
const char *certihost = NULL ;
- ifstream* file = new ifstream("RTIA.dat", ios::in);
+ ifstream file("RTIA.dat", ios::in);
- if (!file->is_open()) {
+ if (!file.is_open()) {
certihost = getenv("CERTI_HOST");
if (NULL == certihost) {
certihost = default_host ;
}
}
else {
- file->get(nom_serveur_RTIG, 200);
- file->close();
- delete file ;
+ file.get(nom_serveur_RTIG, 200);
+ file.close();
certihost = nom_serveur_RTIG ;
}
@@ -340,4 +339,4 @@
}} // namespace certi/rtia
-// $Id: Communications.cc,v 3.29 2008/06/12 07:39:51 erk Exp $
+// $Id: Communications.cc,v 3.30 2008/06/13 10:55:14 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libCERTI/RootObject.hh libCERTI/ObjectCla...,
certi-cvs <=