[magics] 40/63: Enable unique_ptr
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Mar 24 10:41:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit da1752da4b90d8391687664927d7a5e1dd8144cf
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Nov 1 02:28:21 2016 +0000
Enable unique_ptr
---
debian/patches/series | 2 +-
debian/patches/unique-ptr.patch | 128 +++++++++++++++++-----------------------
2 files changed, 54 insertions(+), 76 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 289b14d..4b600a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,5 @@ soname-version.patch
reproducibility.patch
pkgconfig-fix.patch
cmake-config.patch
-#unique-ptr.patch
+unique-ptr.patch
numpy-fixes.patch
diff --git a/debian/patches/unique-ptr.patch b/debian/patches/unique-ptr.patch
index 6692488..f544528 100644
--- a/debian/patches/unique-ptr.patch
+++ b/debian/patches/unique-ptr.patch
@@ -1,13 +1,13 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: For G++ 6, we move to c++14, auto_ptr is deprecated.
So use std::unique_ptr
-Last-Updated: 2016-03-22
+Last-Updated: 2016-11-01
Forwarded: no
-Index: magics++-2.29.2/src/basic/ParameterSettings.cc
+Index: magics++-2.29.6/src/basic/ParameterSettings.cc
===================================================================
---- magics++-2.29.2.orig/src/basic/ParameterSettings.cc
-+++ magics++-2.29.2/src/basic/ParameterSettings.cc
+--- magics++-2.29.6.orig/src/basic/ParameterSettings.cc
++++ magics++-2.29.6/src/basic/ParameterSettings.cc
@@ -51,7 +51,7 @@ void setAttribute(const vector<string>&
}
}
@@ -26,10 +26,10 @@ Index: magics++-2.29.2/src/basic/ParameterSettings.cc
}
}
-Index: magics++-2.29.2/src/basic/ParameterSettings.h
+Index: magics++-2.29.6/src/basic/ParameterSettings.h
===================================================================
---- magics++-2.29.2.orig/src/basic/ParameterSettings.h
-+++ magics++-2.29.2/src/basic/ParameterSettings.h
+--- magics++-2.29.6.orig/src/basic/ParameterSettings.h
++++ magics++-2.29.6/src/basic/ParameterSettings.h
@@ -24,10 +24,10 @@
#include <Colour.h>
@@ -79,10 +79,10 @@ Index: magics++-2.29.2/src/basic/ParameterSettings.h
MagLog::debug() << "Parameter [" << name << "] set to " << val->second << endl;
}
catch (...) {
-Index: magics++-2.29.2/src/decoders/GribDecoder.cc
+Index: magics++-2.29.6/src/decoders/GribDecoder.cc
===================================================================
---- magics++-2.29.2.orig/src/decoders/GribDecoder.cc
-+++ magics++-2.29.2/src/decoders/GribDecoder.cc
+--- magics++-2.29.6.orig/src/decoders/GribDecoder.cc
++++ magics++-2.29.6/src/decoders/GribDecoder.cc
@@ -90,7 +90,7 @@ void GribDecoder::set(const GribLoop& lo
index_ = loop.uniqueId_;
interpolation_method_ = loop.interpolation_method_;
@@ -101,10 +101,10 @@ Index: magics++-2.29.2/src/decoders/GribDecoder.cc
interpretor_->scaling(*this, scaling, offset,oriUnits,derivedUnits);
if(scaling==1 && offset == 0)
{
-Index: magics++-2.29.2/src/decoders/TitleTemplate.cc
+Index: magics++-2.29.6/src/decoders/TitleTemplate.cc
===================================================================
---- magics++-2.29.2.orig/src/decoders/TitleTemplate.cc
-+++ magics++-2.29.2/src/decoders/TitleTemplate.cc
+--- magics++-2.29.6.orig/src/decoders/TitleTemplate.cc
++++ magics++-2.29.6/src/decoders/TitleTemplate.cc
@@ -171,7 +171,7 @@ bool TitleTemplate::verify(const GribDec
//#ifdef MAGICS_EXCEPTION
try{
@@ -114,10 +114,10 @@ Index: magics++-2.29.2/src/decoders/TitleTemplate.cc
MagLog::debug() << "Found the MatchCriteria for " << criter->first << "\n";
if (!(*object).verify(data, criter->first, criter->second)) return false;
}
-Index: magics++-2.29.2/src/decoders/TitleTemplate.h
+Index: magics++-2.29.6/src/decoders/TitleTemplate.h
===================================================================
---- magics++-2.29.2.orig/src/decoders/TitleTemplate.h
-+++ magics++-2.29.2/src/decoders/TitleTemplate.h
+--- magics++-2.29.6.orig/src/decoders/TitleTemplate.h
++++ magics++-2.29.6/src/decoders/TitleTemplate.h
@@ -122,7 +122,7 @@ public:
#ifdef MAGICS_EXCEPTION
try
@@ -127,10 +127,10 @@ Index: magics++-2.29.2/src/decoders/TitleTemplate.h
(*object)(*(*entry), lines, data);
}
catch (NoFactoryException& e)
-Index: magics++-2.29.2/src/libMagWrapper/MagPlus.cc
+Index: magics++-2.29.6/src/libMagWrapper/MagPlus.cc
===================================================================
---- magics++-2.29.2.orig/src/libMagWrapper/MagPlus.cc
-+++ magics++-2.29.2/src/libMagWrapper/MagPlus.cc
+--- magics++-2.29.6.orig/src/libMagWrapper/MagPlus.cc
++++ magics++-2.29.6/src/libMagWrapper/MagPlus.cc
@@ -558,7 +558,7 @@ bool MagPlus::cartesianGrid(magics::MagR
haxis->icon("Horizontal Axis", "MAXIS");
haxis->label_type_ = xtype;
@@ -158,10 +158,10 @@ Index: magics++-2.29.2/src/libMagWrapper/MagPlus.cc
node->getReady();
//top()->legend(node);
if ( geographical_ ) {
-Index: magics++-2.29.2/src/magics.h
+Index: magics++-2.29.6/src/magics.h
===================================================================
---- magics++-2.29.2.orig/src/magics.h
-+++ magics++-2.29.2/src/magics.h
+--- magics++-2.29.6.orig/src/magics.h
++++ magics++-2.29.6/src/magics.h
@@ -106,7 +106,7 @@ using std::pair;
//using std::list;
using std::map;
@@ -171,10 +171,10 @@ Index: magics++-2.29.2/src/magics.h
#include <exception>
-Index: magics++-2.29.2/src/visualisers/AutomaticContourMethod.h
+Index: magics++-2.29.6/src/visualisers/AutomaticContourMethod.h
===================================================================
---- magics++-2.29.2.orig/src/visualisers/AutomaticContourMethod.h
-+++ magics++-2.29.2/src/visualisers/AutomaticContourMethod.h
+--- magics++-2.29.6.orig/src/visualisers/AutomaticContourMethod.h
++++ magics++-2.29.6/src/visualisers/AutomaticContourMethod.h
@@ -228,7 +228,7 @@ public:
//SampleContourMethod *am = static_cast < SampleContourMethod *> (MagTranslator<string, ContourMethod >()("sampling"));
SampleContourMethod *am =new SampleContourMethod();
@@ -211,10 +211,10 @@ Index: magics++-2.29.2/src/visualisers/AutomaticContourMethod.h
pAkima760Method->resolutionX_ = (fContourResolutionX);
pAkima760Method->resolutionY_ = (fContourResolutionY);
-Index: magics++-2.29.2/src/visualisers/CalculateColourTechnique.cc
+Index: magics++-2.29.6/src/visualisers/CalculateColourTechnique.cc
===================================================================
---- magics++-2.29.2.orig/src/visualisers/CalculateColourTechnique.cc
-+++ magics++-2.29.2/src/visualisers/CalculateColourTechnique.cc
+--- magics++-2.29.6.orig/src/visualisers/CalculateColourTechnique.cc
++++ magics++-2.29.6/src/visualisers/CalculateColourTechnique.cc
@@ -52,8 +52,8 @@ void CalculateColourTechnique::print(ost
void CalculateColourTechnique::set(const ColourTechniqueInterface& attributes)
@@ -226,10 +226,10 @@ Index: magics++-2.29.2/src/visualisers/CalculateColourTechnique.cc
direction_ = attributes.getDirection();
}
-Index: magics++-2.29.2/src/visualisers/LabelPlotting.cc
+Index: magics++-2.29.6/src/visualisers/LabelPlotting.cc
===================================================================
---- magics++-2.29.2.orig/src/visualisers/LabelPlotting.cc
-+++ magics++-2.29.2/src/visualisers/LabelPlotting.cc
+--- magics++-2.29.6.orig/src/visualisers/LabelPlotting.cc
++++ magics++-2.29.6/src/visualisers/LabelPlotting.cc
@@ -41,7 +41,7 @@ void LabelPlotting::prepare(NoGridPlotti
if ( *colour_ == "UNDEFINED" ) {
@@ -239,20 +239,11 @@ Index: magics++-2.29.2/src/visualisers/LabelPlotting.cc
}
if ( longitudes_.empty() )
-Index: magics++-2.29.2/tools/xml2cc.pl
+Index: magics++-2.29.6/tools/xml2cc.pl
===================================================================
---- magics++-2.29.2.orig/tools/xml2cc.pl
-+++ magics++-2.29.2/tools/xml2cc.pl
-@@ -300,7 +300,7 @@ EOF
- {
- print <<EOF;
- void set$method($to* $value)
-- { auto_ptr<$to> tmp($value); $member\_ = tmp; }
-+ { unique_ptr<$to> tmp($value); $member\_ = tmp; }
- const $to& get$method() const
- { return *$member\_; }
-
-@@ -342,7 +342,7 @@ EOF
+--- magics++-2.29.6.orig/tools/xml2cc.pl
++++ magics++-2.29.6/tools/xml2cc.pl
+@@ -298,7 +298,7 @@ EOF
}
else
{
@@ -261,10 +252,19 @@ Index: magics++-2.29.2/tools/xml2cc.pl
}
}
-Index: magics++-2.29.2/tools/xml2cc.pl.workshop
+@@ -538,7 +538,7 @@ EOF
+ }
+ else
+ {
+- print "\t$member\_ = auto_ptr<$to>(other.$member\_->clone());\n";
++ print "\t$member\_ = unique_ptr<$to>(other.$member\_->clone());\n";
+ }
+
+ print "";
+Index: magics++-2.29.6/tools/xml2cc.pl.workshop
===================================================================
---- magics++-2.29.2.orig/tools/xml2cc.pl.workshop
-+++ magics++-2.29.2/tools/xml2cc.pl.workshop
+--- magics++-2.29.6.orig/tools/xml2cc.pl.workshop
++++ magics++-2.29.6/tools/xml2cc.pl.workshop
@@ -315,7 +315,7 @@ EOF
{
print <<EOF;
@@ -283,33 +283,11 @@ Index: magics++-2.29.2/tools/xml2cc.pl.workshop
}
}
-Index: magics++-2.29.2/tools/xml2cc_new.pl
-===================================================================
---- magics++-2.29.2.orig/tools/xml2cc_new.pl
-+++ magics++-2.29.2/tools/xml2cc_new.pl
-@@ -304,7 +304,7 @@ EOF
- }
- else
- {
-- print "\tauto_ptr<$to> $member\_;\n";
-+ print "\tunique_ptr<$to> $member\_;\n";
- }
- }
-
-@@ -549,7 +549,7 @@ EOF
- }
- else
- {
-- print "\t$member\_ = auto_ptr<$to>(other.$member\_->clone());\n";
-+ print "\t$member\_ = unique_ptr<$to>(other.$member\_->clone());\n";
- }
-
- print "";
-Index: magics++-2.29.2/tools/xml2mv.pl
+Index: magics++-2.29.6/tools/xml2mv.pl
===================================================================
---- magics++-2.29.2.orig/tools/xml2mv.pl
-+++ magics++-2.29.2/tools/xml2mv.pl
-@@ -450,7 +450,7 @@ EOF
+--- magics++-2.29.6.orig/tools/xml2mv.pl
++++ magics++-2.29.6/tools/xml2mv.pl
+@@ -447,7 +447,7 @@ EOF
{
print "\t\t\tstring $member\_s = request(\"$name\");\n";
@@ -318,7 +296,7 @@ Index: magics++-2.29.2/tools/xml2mv.pl
}
else
{
-@@ -477,7 +477,7 @@ EOF
+@@ -474,7 +474,7 @@ EOF
$arg = "(request.countValues(\"$name\") ? (string) request(\"$name\") : \"$mv_default\")";
print "\t\tstring $member\_s = $arg;\n";
@@ -327,7 +305,7 @@ Index: magics++-2.29.2/tools/xml2mv.pl
}
else
{
-@@ -514,7 +514,7 @@ EOF
+@@ -511,7 +511,7 @@ EOF
print "\t\t\t$member\_w = SimpleFactory<$wrapper_t>::create(\"$mv_default\");\n";
print "\t\t}\n";
print "\t\t$member\_w->set(request);\n";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list