[metview] 09/15: update patch
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 a43b25e2541cf8a0b562a751cb8fab714c38d78c
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Mar 22 18:38:46 2016 +0000
update patch
---
debian/patches/auto-ptr.patch | 137 +++++++++++++++++++++++++++++++++++-------
1 file changed, 115 insertions(+), 22 deletions(-)
diff --git a/debian/patches/auto-ptr.patch b/debian/patches/auto-ptr.patch
index 384b1f1..43b6275 100644
--- a/debian/patches/auto-ptr.patch
+++ b/debian/patches/auto-ptr.patch
@@ -7,19 +7,22 @@ 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&()
+@@ -56,11 +56,11 @@ Log::operator ostream&()
if(tee_.get() == 0)
{
- auto_ptr<ostream> o(new ofstream(path_.str().c_str(),ios::app));
+- out_ = o;
+ unique_ptr<ostream> o(new ofstream(path_.str().c_str(),ios::app));
- out_ = o;
++ out_ = move(o);
- auto_ptr<ostream> t(new TeeStream(global(),*out_));
+- tee_ = t;
+ unique_ptr<ostream> t(new TeeStream(global(),*out_));
- tee_ = t;
++ tee_ = move(t);
+ }
@@ -138,4 +138,4 @@ ostream& Log::find(IconObject* o)
string str;
str=string(buf);
@@ -566,16 +569,17 @@ 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 ):
+@@ -29,15 +29,15 @@ Page::Page ( MvRequest& pageRequest ):
dropShouldStay_(false)
{
// Each page has its own graphics engine
- auto_ptr <GraphicsEngine> eng ( GraphicsEngineFactory::Make ( *this ) );
+- engine_ = eng;
+ unique_ptr <GraphicsEngine> eng ( GraphicsEngineFactory::Make ( *this ) );
- engine_ = eng;
++ engine_ = move(eng);
// Find out if there is a view associated with the request
-@@ -37,7 +37,7 @@ Page::Page ( MvRequest& pageRequest ):
+ MvRequest viewRequest = pageRequest.getSubrequest( "VIEW" );
const char* viewClass = (const char*)viewRequest.getVerb();
if ( viewClass && ObjectList::IsGeographicalView(viewClass) )
{
@@ -584,56 +588,67 @@ Index: metview-4.6.5/src/uPlot/Page.cc
// If AREA is not given, Magics will use the default value
if ( (const char*)viewRequest("AREA") )
-@@ -74,7 +74,7 @@ Page::Page ( MvRequest& pageRequest ):
+@@ -74,8 +74,8 @@ Page::Page ( MvRequest& pageRequest ):
}
// Create a view associated to the page
- auto_ptr <PlotModView> view ( PlotModViewFactory::Make (*this, viewRequest ) );
+- myView_ = view;
+ unique_ptr <PlotModView> view ( PlotModViewFactory::Make (*this, viewRequest ) );
- myView_ = view;
++ myView_ = move(view);
// By default, indicates that a drawing needs to be performed later.
-@@ -96,15 +96,15 @@ Page::Page ( const Page & old ):
+ // This default will be overrulled if the dropping icon triggers a call
+@@ -96,16 +96,16 @@ 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() ) );
+- projection_ = proj;
+ unique_ptr<PmProjection> proj( PmProjectionFactory::Make ( old.myView_->ViewRequest() ) );
- projection_ = proj;
++ projection_ = move(proj);
// Each page has its own graphics engine, create one for this page
- auto_ptr <GraphicsEngine> eng ( GraphicsEngineFactory::Make ( *this ) );
+- engine_ = eng;
+ unique_ptr <GraphicsEngine> eng ( GraphicsEngineFactory::Make ( *this ) );
- engine_ = eng;
++ engine_ = move(eng);
// Clone the view associated to the page and set the new owner.
- auto_ptr <PlotModView> view ( old.GetView().Clone() ) ;
+- myView_ = view;
+ unique_ptr <PlotModView> view ( old.GetView().Clone() ) ;
- myView_ = view;
++ myView_ = move(view);
myView_->Owner(*this);
}
-@@ -1268,7 +1268,7 @@ void
+
+@@ -1268,9 +1268,9 @@ 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;
+- projection_ = proj;
++ projection_ = move(proj);
}
+
+ #if 0
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:
+@@ -233,8 +233,8 @@ public:
virtual PlotModView& GetView() const
{ return *myView_; }
- void SetView(auto_ptr<PlotModView>& newView)
+- { myView_ = newView; }
+ void SetView(unique_ptr<PlotModView>& newView)
- { myView_ = newView; }
++ { myView_ = move(newView); }
int FirstPrintable ();
+
@@ -296,9 +296,9 @@ private:
Page& operator=(const Page&);
@@ -659,15 +674,17 @@ 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
+@@ -848,8 +848,8 @@ void
Presentable::SetDeviceData ( DeviceData* devdata )
{
require ( devdata != 0 );
- auto_ptr <DeviceData> p ( devdata );
+- deviceData_ = p;
+ unique_ptr <DeviceData> p ( devdata );
- deviceData_ = p;
++ deviceData_ = move(p);
}
+ DeviceData*
@@ -1376,7 +1376,7 @@ void Presentable::GetDataUnitInfo ( MvRe
{
// Build a new data decoder, which will provide information
@@ -694,24 +711,29 @@ 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
+@@ -120,8 +120,8 @@ SuperPage::SuperPage(const SuperPage &ol
printIndex_(0)
{
// Make a new icon db from the old one
- auto_ptr<MvIconDataBase> iconDb( new MvIconDataBase(old.IconDataBase() ) );
+- iconDataBase_ = iconDb;
+ unique_ptr<MvIconDataBase> iconDb( new MvIconDataBase(old.IconDataBase() ) );
- iconDataBase_ = iconDb;
++ iconDataBase_ = move(iconDb);
// Set new owner for preferences
-@@ -396,7 +396,7 @@ SuperPage::SetDeviceInfo ( const MvReque
+ preferences_.Owner(*this);
+@@ -396,9 +396,9 @@ 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;
+- myDevice_ = dev;
++ myDevice_ = move(dev);
+ // The device is a visitor - this command will trigger
+ // its visit (i.e., its traversal through the page hierarchy)
@@ -439,7 +439,7 @@ SuperPage::GenerateMacro( )
macroFileName_ = MacroVisitor::CreateFileName ( myRequest_ );
@@ -736,3 +758,74 @@ Index: metview-4.6.5/src/uPlot/SuperPage.h
Preferences preferences_; // preferences associated to the superpage
#if 0
+Index: metview-4.6.5/srv/build/metview/metview-4.6.5/src/libUtil/inc_stl.h
+===================================================================
+--- metview-4.6.5.orig/srv/build/metview/metview-4.6.5/src/libUtil/inc_stl.h
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/***************************** LICENSE START ***********************************
+-
+- Copyright 2012 ECMWF and INPE. This software is distributed under the terms
+- of the Apache License version 2.0. In applying this license, ECMWF does not
+- waive the privileges and immunities granted to it by virtue of its status as
+- an Intergovernmental Organization or submit itself to any jurisdiction.
+-
+- ***************************** LICENSE END *************************************/
+-
+-#ifndef INC_STL_H_
+-#define INC_STL_H_
+-
+-//-- this branch is for standard STL implementations
+-
+-#include <set>
+-#include <map>
+-
+-#ifdef HASHMAP
+-#include <hash_map>
+-#endif
+-
+-#include <algorithm>
+-#include <functional>
+-#include <list>
+-#include <vector>
+-#include <stack>
+-#include <memory>
+-#include <string>
+-
+-#ifndef NOUSING
+-//-- for HPUX aCC
+-
+-using std::unique_ptr;
+-using std::less;
+-using std::list;
+-using std::map;
+-
+-#ifdef HASHMAP
+-using std::hash_map;
+-#endif
+-
+-using std::multimap;
+-using std::pair;
+-using std::set;
+-using std::stack;
+-using std::vector;
+-
+-using std::back_inserter;
+-using std::copy;
+-using std::fill;
+-using std::find;
+-using std::for_each;
+-using std::greater;
+-using std::inserter;
+-using std::max_element;
+-using std::min_element;
+-using std::set_intersection;
+-using std::sort;
+-using std::swap;
+-
+-#endif
+-// ! NOUSING
+-
+-
+-#endif
+-//INC_STL_H_
--
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