[metview] 07/15: auto-ptr.patch: remove obsolete auto_ptrs.
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Jun 20 07:51:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/4.6.5-3
in repository metview.
commit 306c18fd54e7c58e8b65d88f212d3568cdf37dcc
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Mar 20 15:04:39 2016 +0000
auto-ptr.patch: remove obsolete auto_ptrs.
---
debian/changelog | 1 +
debian/patches/auto-ptr.patch | 738 ++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 740 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ef34134..f951c74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ metview (4.6.5-1) UNRELEASED; urgency=medium
* New upstream release:
- fix-paths.patch removed
* Standards-Version: 3.9.7. No changes required.
+ * auto-ptr.patch: remove obsolete auto_ptrs.
-- Alastair McKinstry <mckinstry at debian.org> Fri, 18 Mar 2016 14:09:14 +0000
diff --git a/debian/patches/auto-ptr.patch b/debian/patches/auto-ptr.patch
new file mode 100644
index 0000000..384b1f1
--- /dev/null
+++ b/debian/patches/auto-ptr.patch
@@ -0,0 +1,738 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Move auto_ptr -> std::unique_ptr() for c++11 standard
+Last-Updated: 2016-03-21
+Forwarded: no
+
+Index: metview-4.6.5/src/Desktop/Log.cc
+===================================================================
+--- metview-4.6.5.orig/src/Desktop/Log.cc
++++ metview-4.6.5/src/Desktop/Log.cc
+@@ -56,10 +56,10 @@ Log::operator ostream&()
+ if(tee_.get() == 0)
+ {
+
+- auto_ptr<ostream> o(new ofstream(path_.str().c_str(),ios::app));
++ unique_ptr<ostream> o(new ofstream(path_.str().c_str(),ios::app));
+ out_ = o;
+
+- auto_ptr<ostream> t(new TeeStream(global(),*out_));
++ unique_ptr<ostream> t(new TeeStream(global(),*out_));
+ tee_ = t;
+
+
+@@ -138,4 +138,4 @@ ostream& Log::find(IconObject* o)
+ string str;
+ str=string(buf);
+ return str;
+-}*/
+\ No newline at end of file
++}*/
+Index: metview-4.6.5/src/Desktop/Log.h
+===================================================================
+--- metview-4.6.5.orig/src/Desktop/Log.h
++++ metview-4.6.5/src/Desktop/Log.h
+@@ -41,8 +41,8 @@ private:
+ Log& operator=(const Log&);
+
+ Path path_;
+- auto_ptr<ostream> out_;
+- auto_ptr<ostream> tee_;
++ unique_ptr<ostream> out_;
++ unique_ptr<ostream> tee_;
+ IconObject* object_;
+
+ static ostream& global();
+Index: metview-4.6.5/src/Macro/grib.cc
+===================================================================
+--- metview-4.6.5.orig/src/Macro/grib.cc
++++ metview-4.6.5/src/Macro/grib.cc
+@@ -376,10 +376,10 @@ nontested_grib_api_port("GenerateFunctio
+ field *g = get_field(v,i,expand_mem);
+ field *h = get_field(w,i,expand_mem);
+
+- auto_ptr<MvGridBase> grd( MvGridFactory( g ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( g ) );
+ if( ! grd->hasLocationInfo() )
+ return Error("GenerateFunction: unimplemented or spectral data - unable to extract location data");
+- auto_ptr<MvGridBase> grdOut( MvGridFactory( h ) );
++ unique_ptr<MvGridBase> grdOut( MvGridFactory( h ) );
+
+ bool cont = true;
+ while( cont ) //-- process current field
+@@ -526,11 +526,11 @@ Value MaskFunction::Execute(int arity,Va
+
+ for(i = 0; i < v->count ;i++)
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+ if(! grd->hasLocationInfo() )
+ return Error( "mask: unimplemented or spectral data - unable to extract location data" );
+
+- auto_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
++ unique_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
+
+ for( int j=0; j < grd->length(); ++j )
+ {
+@@ -629,7 +629,7 @@ Value RMaskFunction::Execute( int arity,
+
+ for( i = 0; i < v->count; i++ ) //-- for all fields in a fieldset
+ {
+- auto_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
++ unique_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
+
+ if(! newGrd->hasLocationInfo() )
+ return Error( "rmask: unimplemented or spectral data - unable to extract location data" );
+@@ -725,7 +725,7 @@ Value GridDistanceFunction::Execute( int
+
+ for( i = 0; i < v->count; i++ ) //-- for all fields in a fieldset
+ {
+- auto_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
++ unique_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
+
+ if(! newGrd->hasLocationInfo() )
+ return Error( "distance: unimplemented or spectral data - unable to extract location data" );
+@@ -1828,11 +1828,11 @@ Value CosLatFunction::Execute(int,Value
+
+ for(i = 0; i < v->count ;i++)
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+ if(! grd->hasLocationInfo() )
+ return Error( "coslat: unimplemented or spectral data - unable to extract location data" );
+
+- auto_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
++ unique_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
+
+ for( int j=0; j < grd->length(); ++j )
+ {
+@@ -1870,11 +1870,11 @@ Value SinLatFunction::Execute(int,Value
+
+ for(i = 0; i < v->count ;i++)
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+ if(! grd->hasLocationInfo() )
+ return Error( "sinlat: unimplemented or spectral data - unable to extract location data" );
+
+- auto_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
++ unique_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
+
+ for( int j=0; j < grd->length(); ++j )
+ {
+@@ -1976,7 +1976,7 @@ Value GridLatLonsFunction::Execute(int /
+
+ for(i = 0; i < fs->count ;i++) // for each field...
+ {
+- auto_ptr<MvGridBase> grid( MvGridFactory( fs->fields[i] ) );
++ unique_ptr<MvGridBase> grid( MvGridFactory( fs->fields[i] ) );
+ if(! grid->hasLocationInfo() )
+ return Error( "gridlats/gridlons: unimplemented or spectral data - unable to extract location data" );
+
+@@ -2565,15 +2565,15 @@ Value IntegrateFunction::Execute(int ari
+
+ for(i = 0; i < v->count ;i++)
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+ if(! grd->hasLocationInfo() )
+ return Error( "integrate: unimplemented or spectral data - unable to extract location data" );
+
+- auto_ptr<MvGridBase> maskgrd;
++ unique_ptr<MvGridBase> maskgrd;
+ if( z )
+ {
+- auto_ptr<MvGridBase> tmp( MvGridFactory( z->fields[ z->count>1 ? i : 0 ] ) );
+- maskgrd = tmp;
++ unique_ptr<MvGridBase> tmp( MvGridFactory( z->fields[ z->count>1 ? i : 0 ] ) );
++ maskgrd = move(tmp);
+ }
+
+ if( maskgrd.get() && ! maskgrd->isEqual( grd.get() ) )
+@@ -2685,7 +2685,7 @@ Value MinMaxAreaFunction::Execute(int, V
+
+ for(i = 0; i < v->count ;i++)
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+ if(! grd->hasLocationInfo() )
+ return Error( "minvalue/maxvalue: unimplemented or spectral data - unable to extract location data" );
+
+@@ -2826,7 +2826,7 @@ Value InterpolateFunction::Execute(int a
+
+ release_field(g);
+ #else
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+
+ if( ! grd->hasLocationInfo() )
+ {
+@@ -2991,7 +2991,7 @@ Value NearestGridpointFunction::Execute(
+ vvals = new CVector(vlat->Count());
+
+
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+
+ if( ! grd->hasLocationInfo() )
+ {
+@@ -3229,15 +3229,15 @@ Value FindFunction::Execute(int arity,Va
+
+ for(i = 0; i < v->count ;i++)
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+ if(! grd->hasLocationInfo() )
+ return Error( "find: unimplemented or spectral data - unable to extract location data" );
+
+- auto_ptr<MvGridBase> maskgrd;
++ unique_ptr<MvGridBase> maskgrd;
+ if( z )
+ {
+- auto_ptr<MvGridBase> tmp( MvGridFactory( z->fields[ z->count>1 ? i : 0 ] ) );
+- maskgrd = tmp;
++ unique_ptr<MvGridBase> tmp( MvGridFactory( z->fields[ z->count>1 ? i : 0 ] ) );
++ maskgrd = move(tmp);
+ }
+
+ if( maskgrd.get() && ! maskgrd->isEqual( grd.get() ) )
+@@ -3349,7 +3349,7 @@ Value GFindFunction::Execute(int arity,V
+
+ for(int i = 0; i < v->count ;i++)
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+ if(! grd->hasLocationInfo() )
+ return Error( "gfind: unimplemented or spectral data - unable to extract location data" );
+
+@@ -3423,7 +3423,7 @@ Value VertIntFunction::Execute(int arity
+ {
+ field *g = GetIndexedFieldWithAtLeastPackedMem (v,i);
+ //gribsec1 *s1 = (gribsec1*)&g->ksec1[0];
+- auto_ptr<MvGridBase> grd( MvGridFactory( g ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( g ) );
+ //if(s1->parameter == 152) n = i;
+ if( grd->getLong(parameterKey) == 152 )
+ n = i;
+@@ -3765,7 +3765,7 @@ Value UniVertIntFunction::Execute(int /*
+ for(int i = 0; (i < fs_data->count) && (n_lnsp == -1) ; ++i)
+ {
+ f_lnsp_orig = GetIndexedFieldWithAtLeastPackedMem(fs_data,i);
+- auto_ptr<MvGridBase> grd( MvGridFactory( f_lnsp_orig ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( f_lnsp_orig ) );
+ if( grd->getLong(parameterKey) == lnsp_ )
+ {
+ n_lnsp = i; //-- lnsp found - stop the loop
+@@ -4333,7 +4333,7 @@ Value UniThicknessAndPressureFunction::E
+ for(i = 0; i < w->count ;i++)
+ {
+ field *g = GetIndexedFieldWithAtLeastPackedMem(w,i);
+- auto_ptr<MvField> fld( new MvField( g ) );
++ unique_ptr<MvField> fld( new MvField( g ) );
+ levels[i] = (int)fld->level();
+ release_field(g);
+ }
+@@ -4347,7 +4347,7 @@ Value UniThicknessAndPressureFunction::E
+
+ for(int i = 0; i < v->count ;i++)
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+ if(! grd->isValid() )
+ return Error( "unipressure/unithickness: cannot process this type of grid!" );
+ long param = grd->getLong(parameterKey);
+@@ -4376,7 +4376,7 @@ Value UniThicknessAndPressureFunction::E
+ grd->init();
+
+ field* h = copy_field(g,false);
+- auto_ptr<MvGridBase> grdOut( MvGridFactory( h ) );
++ unique_ptr<MvGridBase> grdOut( MvGridFactory( h ) );
+
+ double a1, b1, a0, b0;
+ if( ! grd->vertCoordCoefs( a1, b1, level ) )
+@@ -4608,7 +4608,7 @@ Value GribMatrixFunction::Execute(int,Va
+ {
+ field *g = get_field(v,i,expand_mem);
+ //gribsec2_ll *s2 = (gribsec2_ll*) &g->ksec2[0];
+- auto_ptr<MvGridBase> grd( MvGridFactory( g ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( g ) );
+ string gridType = grd->gridType();
+
+ if ((gridType != cLatLonGrid) && (gridType != cSatelliteImage))
+@@ -4679,18 +4679,18 @@ Value GribDirectionFunction::Execute(int
+
+ for(int i = 0; i < u->count ;i++)
+ {
+- auto_ptr<MvGridBase> gu( MvGridFactory( u->fields[i] ) );
++ unique_ptr<MvGridBase> gu( MvGridFactory( u->fields[i] ) );
+ if( gu->gridType() == "NA" )
+ return Error( "direction: U: cannot process this type of field!" );
+
+- auto_ptr<MvGridBase> gv( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> gv( MvGridFactory( v->fields[i] ) );
+ if( gv->gridType() == "NA" )
+ return Error( "direction: V: cannot process this type of field!" );
+
+ if( ! gu->isEqual( gv.get() ) )
+ return Error( "direction: U and V: different grids!" );
+
+- auto_ptr<MvGridBase> gdir( MvGridFactory( dir->fields[i] ) );
++ unique_ptr<MvGridBase> gdir( MvGridFactory( dir->fields[i] ) );
+
+ for( int j=0; j < gu->length(); ++j )
+ {
+@@ -4754,7 +4754,7 @@ Value MeanEwFunction::Execute(int,Value
+
+ for( int i = 0; i < v->count; i++ )
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+
+ if(! grd->hasLocationInfo() )
+ return Error( "mean_ew: unimplemented grid type: %s", grd->gridType().c_str() );
+@@ -4765,7 +4765,7 @@ Value MeanEwFunction::Execute(int,Value
+ grd->gridType() != cGaussianReducedGrid )
+ return Error( "mean_ew: unsuitable grid type: %s", grd->gridType().c_str() );
+
+- auto_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
++ unique_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
+
+ double currentLatRow = grd->lat_y();
+ bool cont = true;
+@@ -4870,7 +4870,7 @@ LatLonAverageFunction::Execute(int,Value
+
+ for( int fi = 0; fi < fs->count; fi++ ) //-- loop over fields in fieldset
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( fs->fields[fi] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( fs->fields[fi] ) );
+ if(! grd->hasLocationInfo() )
+ return Error( "average_xx: unimplemented grid type: %s", grd->gridType().c_str() );
+
+@@ -5054,12 +5054,12 @@ Value GribIntToFloatFunction::Execute( i
+ for( int i = 0; i < v->count; ++i ) //-- for all fields in a fieldset
+ {
+ field *g = get_field(v,i,expand_mem);
+- auto_ptr<MvGridBase> grd( MvGridFactory( g ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( g ) );
+ if(! grd->isValid() )
+ return Error( "float: unimplemented grid type: %s", grd->gridType().c_str() );
+
+ field *h = get_field(z,i,expand_mem);
+- auto_ptr<MvGridBase> grdOut( MvGridFactory( h ) );
++ unique_ptr<MvGridBase> grdOut( MvGridFactory( h ) );
+ if(! grdOut->isValid() )
+ return Error( "float: unimplemented grid type: %s", grdOut->gridType().c_str() );
+
+@@ -5132,12 +5132,12 @@ Value GribFloatToIntFunction::Execute( i
+ for( int i = 0; i < v->count; ++i ) //-- for all fields in a fieldset
+ {
+ field *g = get_field(v,i,expand_mem); //-- input field
+- auto_ptr<MvGridBase> grd( MvGridFactory( g ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( g ) );
+ if(! grd->isValid() )
+ return Error( "integer: unimplemented grid type: %s", grd->gridType().c_str() );
+
+ field *h = get_field(z,i,expand_mem); //-- output field
+- auto_ptr<MvGridBase> grdOut( MvGridFactory( h ) );
++ unique_ptr<MvGridBase> grdOut( MvGridFactory( h ) );
+ if(! grdOut->isValid() )
+ return Error( "integer: unimplemented grid type: %s", grdOut->gridType().c_str() );
+
+@@ -5293,11 +5293,11 @@ Value CovarianceFunction::Execute(int ar
+
+ double CovarFunc( field* f1, field* f2, const MvGeoBox& area )
+ {
+- auto_ptr<MvGridBase> grd1( MvGridFactory( f1 ) );
++ unique_ptr<MvGridBase> grd1( MvGridFactory( f1 ) );
+ if(! grd1->hasLocationInfo() )
+ throw MvException( "Unimplemented or spectral data - unable to extract location data" );
+
+- auto_ptr<MvGridBase> grd2( MvGridFactory( f2 ) );
++ unique_ptr<MvGridBase> grd2( MvGridFactory( f2 ) );
+ if(! grd2->hasLocationInfo() )
+ throw MvException( "Unimplemented or spectral data - unable to extract location data" );
+
+@@ -5612,7 +5612,7 @@ Value FrequenciesFunction::Execute(int a
+ bool found;
+ for(i = 0; i < v->count ;i++)
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+ if(! grd->hasLocationInfo() )
+ return Error( "frequencies: unimplemented or spectral data - unable to extract location data" );
+
+@@ -5681,11 +5681,11 @@ Value FillMVEWFunction::Execute(int,Valu
+
+ for( int i = 0; i < v->count; i++)
+ {
+- auto_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
++ unique_ptr<MvGridBase> grd( MvGridFactory( v->fields[i] ) );
+ if(! grd->isRegularLatLongGrid() )
+ return Error( "fill_missing_values_ew: implemented only for regular latlong format" );
+
+- auto_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
++ unique_ptr<MvGridBase> newGrd( MvGridFactory( z->fields[i] ) );
+
+ // Copy first point
+ v1 = grd->value();
+Index: metview-4.6.5/src/MetviewUI/CMakeLists.txt
+===================================================================
+--- metview-4.6.5.orig/src/MetviewUI/CMakeLists.txt
++++ metview-4.6.5/src/MetviewUI/CMakeLists.txt
+@@ -385,7 +385,6 @@ set(MetviewUI_srcs
+ XPalette.h
+ XPixmap.h
+ XResource.h
+- auto_ptr.h
+ )
+
+ include_directories( CMAKE_CURRENT_SOURCE_DIR . )
+Index: metview-4.6.5/src/MetviewUI/Log.cc
+===================================================================
+--- metview-4.6.5.orig/src/MetviewUI/Log.cc
++++ metview-4.6.5/src/MetviewUI/Log.cc
+@@ -63,10 +63,10 @@ Log::operator ostream&()
+ if(tee_.get() == 0)
+ {
+
+- auto_ptr<ostream> o(new ofstream(path_.str().c_str(),ios::app));
++ unique_ptr<ostream> o(new ofstream(path_.str().c_str(),ios::app));
+ out_ = o;
+
+- auto_ptr<ostream> t(new TeeStream(global(),*out_));
++ unique_ptr<ostream> t(new TeeStream(global(),*out_));
+ tee_ = t;
+
+
+Index: metview-4.6.5/src/MetviewUI/Log.h
+===================================================================
+--- metview-4.6.5.orig/src/MetviewUI/Log.h
++++ metview-4.6.5/src/MetviewUI/Log.h
+@@ -92,8 +92,8 @@ private:
+ // -- Members
+
+ Path path_;
+- auto_ptr<ostream> out_;
+- auto_ptr<ostream> tee_;
++ unique_ptr<ostream> out_;
++ unique_ptr<ostream> tee_;
+ IconObject* object_;
+
+ // -- Methods
+Index: metview-4.6.5/src/libMetview/MvFieldSet.cc
+===================================================================
+--- metview-4.6.5.orig/src/libMetview/MvFieldSet.cc
++++ metview-4.6.5/src/libMetview/MvFieldSet.cc
+@@ -1314,7 +1314,7 @@ double MvField::covar( MvField& other,
+ }
+
+ //-- cReleaseMemoryFalse or cReleaseMemoryTrue???
+- auto_ptr<MvGridBase> grd2( MvGridFactory( other.libmars_field(), cReleaseMemoryTrue ) );
++ unique_ptr<MvGridBase> grd2( MvGridFactory( other.libmars_field(), cReleaseMemoryTrue ) );
+
+ if( ! mvgrid_->isEqual( grd2.get() ) )
+ {
+Index: metview-4.6.5/src/libUtil/CMakeLists.txt
+===================================================================
+--- metview-4.6.5.orig/src/libUtil/CMakeLists.txt
++++ metview-4.6.5/src/libUtil/CMakeLists.txt
+@@ -31,7 +31,7 @@ Tokenizer.cc
+ UtilitiesC.c
+ Cached.h GribMetaData.h LogHandler.h MagicsColours.h MtInputEvent.h MvException.h
+ MvFileInfo.h MvFlextra.h MvGribParC.h MvKeyManager.h MvKeyProfile.h MvMessageMetaData.h MvMsg.h MvOdb.h
+-MvSTL.h MvStopWatch.h MvVersionInfo.h Rectangle.h Request.h UtilitiesC.h auto_ptr.h
++MvSTL.h MvStopWatch.h MvVersionInfo.h Rectangle.h Request.h UtilitiesC.h
+ bits.h gdefines.h inc_iostream.h inc_stl.h min_max_macros.h
+ xec.h
+ Assertions.hpp Box.hpp Factory.hpp Grib.hpp
+Index: metview-4.6.5/src/libUtil/inc_stl.h
+===================================================================
+--- metview-4.6.5.orig/src/libUtil/inc_stl.h
++++ metview-4.6.5/src/libUtil/inc_stl.h
+@@ -30,7 +30,7 @@
+ #ifndef NOUSING
+ //-- for HPUX aCC
+
+-using std::auto_ptr;
++using std::unique_ptr;
+ using std::less;
+ using std::list;
+ using std::map;
+Index: metview-4.6.5/src/uPlot/Canvas.h
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/Canvas.h
++++ metview-4.6.5/src/uPlot/Canvas.h
+@@ -195,7 +195,7 @@ protected:
+ // Members
+ Device& myDevice_; // pointer to the device
+
+-//D auto_ptr <DeviceDriver> canvasDeviceDriver_; // Pointer to the deviceDriver
++//D unique_ptr <DeviceDriver> canvasDeviceDriver_; // Pointer to the deviceDriver
+
+ double aspectRatio_; // aspectRatio must be preserved
+
+Index: metview-4.6.5/src/uPlot/CartesianView.cc
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/CartesianView.cc
++++ metview-4.6.5/src/uPlot/CartesianView.cc
+@@ -253,7 +253,7 @@ void CartesianView::DecodeDataUnit ( MvI
+
+ // Build a new data decoder, which will provide information
+ // about the data
+- auto_ptr<Decoder> decoder ( DecoderFactory::Make ( givenUnit.Request() ) );
++ unique_ptr<Decoder> decoder ( DecoderFactory::Make ( givenUnit.Request() ) );
+ ensure (decoder.get() != 0);
+
+ int subpageId = 0;
+Index: metview-4.6.5/src/uPlot/CommonXSectView.cc
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/CommonXSectView.cc
++++ metview-4.6.5/src/uPlot/CommonXSectView.cc
+@@ -387,7 +387,7 @@ void CommonXSectView::DecodeDataUnit ( M
+
+ // Build a new data decoder, which will provide information
+ // about the data
+- auto_ptr<Decoder> decoder ( DecoderFactory::Make ( dataUnit.Request() ) );
++ unique_ptr<Decoder> decoder ( DecoderFactory::Make ( dataUnit.Request() ) );
+ ensure (decoder.get() != 0);
+
+ int subpageId = 0;
+@@ -514,7 +514,7 @@ bool CommonXSectView::NetCDFtoMatrix(MvI
+ MvRequest Matrix = du.Request();
+
+ MvRequest dcRequest = Matrix.getSubrequest("_DC_REQUEST" );
+- auto_ptr<Decoder> decoder ( DecoderFactory::Make ( dcRequest ) );
++ unique_ptr<Decoder> decoder ( DecoderFactory::Make ( dcRequest ) );
+
+ int offset = Matrix("_OFFSET");
+ const char *fullName = Matrix("_FILE_NAME");
+Index: metview-4.6.5/src/uPlot/DataBuilder.cc
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/DataBuilder.cc
++++ metview-4.6.5/src/uPlot/DataBuilder.cc
+@@ -50,7 +50,7 @@ DataBuilder::Execute (PmContext& context
+ // Then try to get from contents of file
+ if ( ! (const char *)viewName )
+ {
+- auto_ptr<Decoder> decoder ( DecoderFactory::Make ( context.InRequest() ) );
++ unique_ptr<Decoder> decoder ( DecoderFactory::Make ( context.InRequest() ) );
+ viewName = decoder->GetView();
+ }
+ #endif
+Index: metview-4.6.5/src/uPlot/GeoView.cc
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/GeoView.cc
++++ metview-4.6.5/src/uPlot/GeoView.cc
+@@ -213,7 +213,7 @@ void GeoView::DecodeDataUnit ( MvIcon& d
+ MvIconDataBase& dataBase = Owner().IconDataBase();
+
+ // Build a new data decoder, which will provide information about the data
+- auto_ptr<Decoder> decoder ( DecoderFactory::Make ( dataUnit.Request() ) );
++ unique_ptr<Decoder> decoder ( DecoderFactory::Make ( dataUnit.Request() ) );
+ ensure (decoder.get() != 0);
+
+ // Inquire if this Page is empty
+@@ -877,7 +877,7 @@ void GeoView::UpdateView ( MvRequest& vi
+ viewRequest_ = viewRequest;
+
+ // Create a view associated to the page
+- auto_ptr <PlotModView> view ( PlotModViewFactory::Make (Owner(), viewRequest ) );
++ unique_ptr <PlotModView> view ( PlotModViewFactory::Make (Owner(), viewRequest ) );
+ Owner().SetView(view);
+ #endif
+ }
+Index: metview-4.6.5/src/uPlot/MapView.cc
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/MapView.cc
++++ metview-4.6.5/src/uPlot/MapView.cc
+@@ -207,7 +207,7 @@ void MapView::DecodeDataUnit ( MvIcon& d
+
+ // Build a new data decoder, which will provide information
+ // about the data
+- auto_ptr<Decoder> decoder ( DecoderFactory::Make ( dataUnit.Request() ) );
++ unique_ptr<Decoder> decoder ( DecoderFactory::Make ( dataUnit.Request() ) );
+ ensure (decoder.get() != 0);
+
+ // Inquire if this Page is empty
+@@ -380,7 +380,7 @@ MapView::UpdateView ( MvRequest& viewReq
+ viewRequest_ = viewRequest;
+
+ // Create a view associated to the page
+- auto_ptr <PlotModView> view ( PlotModViewFactory::Make (Owner(), viewRequest ) );
++ unique_ptr <PlotModView> view ( PlotModViewFactory::Make (Owner(), viewRequest ) );
+ Owner().SetView(view);
+ #endif
+ }
+Index: metview-4.6.5/src/uPlot/Page.cc
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/Page.cc
++++ metview-4.6.5/src/uPlot/Page.cc
+@@ -29,7 +29,7 @@ Page::Page ( MvRequest& pageRequest ):
+ dropShouldStay_(false)
+ {
+ // Each page has its own graphics engine
+- auto_ptr <GraphicsEngine> eng ( GraphicsEngineFactory::Make ( *this ) );
++ unique_ptr <GraphicsEngine> eng ( GraphicsEngineFactory::Make ( *this ) );
+ engine_ = eng;
+
+ // Find out if there is a view associated with the request
+@@ -37,7 +37,7 @@ Page::Page ( MvRequest& pageRequest ):
+ const char* viewClass = (const char*)viewRequest.getVerb();
+ if ( viewClass && ObjectList::IsGeographicalView(viewClass) )
+ {
+- auto_ptr <PmProjection> proj ( PmProjectionFactory::Make ( viewRequest ) );
++ unique_ptr <PmProjection> proj ( PmProjectionFactory::Make ( viewRequest ) );
+
+ // If AREA is not given, Magics will use the default value
+ if ( (const char*)viewRequest("AREA") )
+@@ -74,7 +74,7 @@ Page::Page ( MvRequest& pageRequest ):
+ }
+
+ // Create a view associated to the page
+- auto_ptr <PlotModView> view ( PlotModViewFactory::Make (*this, viewRequest ) );
++ unique_ptr <PlotModView> view ( PlotModViewFactory::Make (*this, viewRequest ) );
+ myView_ = view;
+
+ // By default, indicates that a drawing needs to be performed later.
+@@ -96,15 +96,15 @@ Page::Page ( const Page & old ):
+ {
+ // ZoomStacks not copied
+ // Easiest to make new projection from view request
+- auto_ptr<PmProjection> proj( PmProjectionFactory::Make ( old.myView_->ViewRequest() ) );
++ unique_ptr<PmProjection> proj( PmProjectionFactory::Make ( old.myView_->ViewRequest() ) );
+ projection_ = proj;
+
+ // Each page has its own graphics engine, create one for this page
+- auto_ptr <GraphicsEngine> eng ( GraphicsEngineFactory::Make ( *this ) );
++ unique_ptr <GraphicsEngine> eng ( GraphicsEngineFactory::Make ( *this ) );
+ engine_ = eng;
+
+ // Clone the view associated to the page and set the new owner.
+- auto_ptr <PlotModView> view ( old.GetView().Clone() ) ;
++ unique_ptr <PlotModView> view ( old.GetView().Clone() ) ;
+ myView_ = view;
+ myView_->Owner(*this);
+ }
+@@ -1268,7 +1268,7 @@ void
+ Page::SetProjection ( const MvRequest& viewRequest )
+ {
+ // Initialize projection based on a request
+- auto_ptr <PmProjection> proj ( PmProjectionFactory::Make ( viewRequest ) );
++ unique_ptr <PmProjection> proj ( PmProjectionFactory::Make ( viewRequest ) );
+
+ projection_ = proj;
+ }
+Index: metview-4.6.5/src/uPlot/Page.h
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/Page.h
++++ metview-4.6.5/src/uPlot/Page.h
+@@ -233,7 +233,7 @@ public:
+ virtual PlotModView& GetView() const
+ { return *myView_; }
+
+- void SetView(auto_ptr<PlotModView>& newView)
++ void SetView(unique_ptr<PlotModView>& newView)
+ { myView_ = newView; }
+
+ int FirstPrintable ();
+@@ -296,9 +296,9 @@ private:
+ Page& operator=(const Page&);
+
+ // Members
+- auto_ptr <PlotModView> myView_;
++ unique_ptr <PlotModView> myView_;
+
+- auto_ptr <GraphicsEngine> engine_;
++ unique_ptr <GraphicsEngine> engine_;
+
+ int firstVisible_;
+ int visibleCount_;
+@@ -308,7 +308,7 @@ private:
+
+ bool dropShouldStay_;
+
+- auto_ptr <PmProjection> projection_; // projection associated with page
++ unique_ptr <PmProjection> projection_; // projection associated with page
+ DrawingPriority drawingPriority_;
+ };
+
+Index: metview-4.6.5/src/uPlot/Presentable.cc
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/Presentable.cc
++++ metview-4.6.5/src/uPlot/Presentable.cc
+@@ -848,7 +848,7 @@ void
+ Presentable::SetDeviceData ( DeviceData* devdata )
+ {
+ require ( devdata != 0 );
+- auto_ptr <DeviceData> p ( devdata );
++ unique_ptr <DeviceData> p ( devdata );
+ deviceData_ = p;
+ }
+
+@@ -1376,7 +1376,7 @@ void Presentable::GetDataUnitInfo ( MvRe
+ {
+ // Build a new data decoder, which will provide information
+ // about the data
+- auto_ptr<Decoder> decoder ( DecoderFactory::Make ((*lCursor).Request() ) );
++ unique_ptr<Decoder> decoder ( DecoderFactory::Make ((*lCursor).Request() ) );
+ ensure (decoder.get() != 0);
+
+ // Read data headers (one by one)
+Index: metview-4.6.5/src/uPlot/Presentable.h
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/Presentable.h
++++ metview-4.6.5/src/uPlot/Presentable.h
+@@ -405,7 +405,7 @@ protected:
+ MvRequest myRequest_; // request used to build me
+ int presentableId_; // unique Id
+ Presentable* myParent_; // next level up on the tree
+- auto_ptr <DeviceData > deviceData_; // information on the device
++ unique_ptr <DeviceData > deviceData_; // information on the device
+ Location myLocation_; // position of the presentable
+
+ // Definition for the tree hierarchy of the Presentable class
+Index: metview-4.6.5/src/uPlot/SuperPage.cc
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/SuperPage.cc
++++ metview-4.6.5/src/uPlot/SuperPage.cc
+@@ -120,7 +120,7 @@ SuperPage::SuperPage(const SuperPage &ol
+ printIndex_(0)
+ {
+ // Make a new icon db from the old one
+- auto_ptr<MvIconDataBase> iconDb( new MvIconDataBase(old.IconDataBase() ) );
++ unique_ptr<MvIconDataBase> iconDb( new MvIconDataBase(old.IconDataBase() ) );
+ iconDataBase_ = iconDb;
+
+ // Set new owner for preferences
+@@ -396,7 +396,7 @@ SuperPage::SetDeviceInfo ( const MvReque
+ // appropriate device Request
+ MvRequest deviceRequest = Device::CreateRequest ( inRequest );
+
+- auto_ptr <Device> dev ( DeviceFactory::Make ( deviceRequest ) );
++ unique_ptr <Device> dev ( DeviceFactory::Make ( deviceRequest ) );
+
+ myDevice_ = dev;
+
+@@ -439,7 +439,7 @@ SuperPage::GenerateMacro( )
+ macroFileName_ = MacroVisitor::CreateFileName ( myRequest_ );
+
+ // Create a new visitor
+- auto_ptr <Visitor> vis ( new MacroVisitor ( macroFileName_ ) );
++ unique_ptr <Visitor> vis ( new MacroVisitor ( macroFileName_ ) );
+
+ // Visit me
+ vis->Visit (*this);
+Index: metview-4.6.5/src/uPlot/SuperPage.h
+===================================================================
+--- metview-4.6.5.orig/src/uPlot/SuperPage.h
++++ metview-4.6.5/src/uPlot/SuperPage.h
+@@ -299,8 +299,8 @@ public:
+ // Members
+ PaperSize size_; // size of superpage in paper coords (cms)
+ string macroFileName_; // name of the macro file which is produced
+- auto_ptr <MvIconDataBase> iconDataBase_; // icon data base (one per superpage)
+- auto_ptr <Device> myDevice_; // device (plot media)
++ unique_ptr <MvIconDataBase> iconDataBase_; // icon data base (one per superpage)
++ unique_ptr <Device> myDevice_; // device (plot media)
+ Preferences preferences_; // preferences associated to the superpage
+
+ #if 0
diff --git a/debian/patches/series b/debian/patches/series
index 306daa9..0a82dca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fpic.patch
hurd.patch
fix-bashisms.patch
g++-6.patch
+auto-ptr.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git
More information about the debian-science-commits
mailing list