Skip to content

Commit 5552559

Browse files
author
Charles PIGNEROL
committed
Pre-release 7.12.0 : replacing instances of the auto_ptr class with instances of the unique_ptr class.
1 parent 10ef7a9 commit 5552559

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

src/Lima/maillage_it.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2475,7 +2475,7 @@ void _MaillageInterne::lire_structure (
24752475

24762476
try
24772477
{
2478-
auto_ptr<_Reader> reader (_Reader::create (this,fichier,format,num));
2478+
unique_ptr<_Reader> reader (_Reader::create (this,fichier,format,num));
24792479
if (0 == reader.get ( ))
24802480
throw read_erreur("Impossible d'initialiser le module de lecture\n");
24812481

@@ -2496,7 +2496,7 @@ void _MaillageInterne::lire(const string& fichier, format_t format, size_type nu
24962496

24972497
try
24982498
{
2499-
auto_ptr<_Reader> reader (_Reader::create (this,fichier,format,num));
2499+
unique_ptr<_Reader> reader (_Reader::create (this,fichier,format,num));
25002500
if (0 == reader.get ( ))
25012501
throw read_erreur("Impossible d'initialiser le module de lecture\n");
25022502

src/Lima/public/Lima/malipp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ class MaliPPReader
11061106
Composition m_composition_polyedres;
11071107

11081108
/** Le fichier HDF. */
1109-
IN_STD auto_ptr<IN_H5 H5File> m_fichier_hdf;
1109+
IN_STD unique_ptr<IN_H5 H5File> m_fichier_hdf;
11101110

11111111
/** Le maillage. */
11121112
IN_H5 Group m_maillage_hdf;
@@ -1277,7 +1277,7 @@ class MaliPPWriter
12771277
IN_H5 Group m_meshGroup;
12781278

12791279
//! Le fichier HDF contenant le maillage.
1280-
IN_STD auto_ptr<IN_H5 H5File> m_hdfFile;
1280+
IN_STD unique_ptr<IN_H5 H5File> m_hdfFile;
12811281

12821282
//! Dimension du maillage.
12831283
dim_t m_dim;

src/Lima/public/Lima/malipp2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ class MaliPPReader2
11041104
Composition m_composition_polyedres;
11051105

11061106
/** Le fichier HDF. */
1107-
IN_STD auto_ptr<H5::H5File> m_fichier_hdf;
1107+
IN_STD unique_ptr<H5::H5File> m_fichier_hdf;
11081108

11091109
/** Le maillage. */
11101110
H5::Group m_maillage_hdf;
@@ -1253,7 +1253,7 @@ class MaliPPWriter2
12531253
H5::Group m_meshGroup;
12541254

12551255
//! Le fichier HDF contenant le maillage.
1256-
IN_STD auto_ptr<H5::H5File> m_hdfFile;
1256+
IN_STD unique_ptr<H5::H5File> m_hdfFile;
12571257

12581258
//! Dimension du maillage.
12591259
dim_t m_dim;

src/Lima/public/LimaP/reader_malipp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public :
161161
IN_H5 Group m_meshGroup;
162162

163163
//! Le fichier HDF contenant le maillage.
164-
IN_STD auto_ptr<IN_H5 H5File> m_hdfFile;
164+
IN_STD unique_ptr<IN_H5 H5File> m_hdfFile;
165165

166166
//! Faut-il forcer la compression des datasets avec la zlib ?
167167
bool m_forceZlib;

src/Lima/public/LimaP/reader_malipp2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public :
152152
IN_H5 Group m_meshGroup;
153153

154154
//! Le fichier HDF contenant le maillage.
155-
IN_STD auto_ptr<IN_H5 H5File> m_hdfFile;
155+
IN_STD unique_ptr<IN_H5 H5File> m_hdfFile;
156156
};
157157

158158

src/Lima/public/LimaP/using_it.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ using std::reverse;
2929
using std::copy;
3030
using std::istrstream;
3131

32-
using std::auto_ptr;
32+
using std::unique_ptr;
3333

3434
using std::iterator;
3535
using std::map;
@@ -74,7 +74,7 @@ using std::max_element;
7474
using std::reverse;
7575
using std::copy;
7676

77-
using std::auto_ptr;
77+
using std::unique_ptr;
7878

7979
using std::exception;
8080

src/Xlmlima_exe/xlmlima.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ int main (int argc, char* argv [])
2323
{
2424
try
2525
{
26-
auto_ptr<XlmLimaAction> action;
26+
unique_ptr<XlmLimaAction> action;
2727
action.reset (XlmLimaFactory::createAction (argc - 1, argv + 1));
2828
if (0 == action.get ( ))
2929
throw XlmLimaException ("xlmlima. Erreur interne : absence d'action.");

0 commit comments

Comments
 (0)