[magics] 05/07: Update unique_ptr.patch

Alastair McKinstry mckinstry at moszumanska.debian.org
Wed Jan 3 12:58:14 UTC 2018


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 9c1ae5c3942de4fde26da94e205eb489b5e71285
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Dec 31 18:32:38 2017 +0000

    Update unique_ptr.patch
---
 debian/changelog                |  1 +
 debian/patches/unique-ptr.patch | 46 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8e7ac80..98dc6e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 magics++ (3.0.0-1) UNRELEASED; urgency=medium
 
   * New upstream release 
+   - Update unique_ptr.patch
   * S-V: 4.1.2; no changes required
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 13 Dec 2017 10:20:46 +0000
diff --git a/debian/patches/unique-ptr.patch b/debian/patches/unique-ptr.patch
index 7dc2f3c..7a72b7c 100644
--- a/debian/patches/unique-ptr.patch
+++ b/debian/patches/unique-ptr.patch
@@ -1,7 +1,7 @@
 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-11-01
+Last-Updated: 2017-12-31
 Forwarded: no
 
 Index: magics++-3.0.0/src/basic/ParameterSettings.cc
@@ -305,3 +305,47 @@ Index: magics++-3.0.0/tools/xml2mv.pl
                  print "\t\tdelete $member\_w;\n\n";
           }
      }
+Index: magics++-3.0.0/tools/docs.template
+===================================================================
+--- magics++-3.0.0.orig/tools/docs.template
++++ magics++-3.0.0/tools/docs.template
+@@ -68,7 +68,7 @@ void {{ object }}Attributes::copy(const
+ 	{% if param.enum  -%}
+ 		{{ param.member }}_ = other.{{ param.member }}_;
+ 	{% else -%}
+- 		{{ param.member }}_ = auto_ptr<{{ param.to }}>(other.{{ param.member }}_->clone());
++ 		{{ param.member }}_ = unique_ptr<{{ param.to }}>(other.{{ param.member }}_->clone());
+ 	{% endif -%}
+ 	{% endfor %}
+ } 
+Index: magics++-3.0.0/tools/header.template
+===================================================================
+--- magics++-3.0.0.orig/tools/header.template
++++ magics++-3.0.0/tools/header.template
+@@ -1,4 +1,3 @@
+-
+ /*******************************  LICENSE  *******************************
+ 
+  * (C) Copyright 1996-2016 ECMWF.
+@@ -65,7 +64,7 @@ public:
+ 	{% if param.enum  -%}
+ 	{{ param.to }} {{ param.member }}_;
+ 	{% else -%}
+- 	auto_ptr<{{ param.to }}> {{ param.member }}_;
++ 	unique_ptr<{{ param.to }}> {{ param.member }}_;
+ 	{% endif -%}
+ 	{% endfor %} 
+ 
+Index: magics++-3.0.0/tools/source.template
+===================================================================
+--- magics++-3.0.0.orig/tools/source.template
++++ magics++-3.0.0/tools/source.template
+@@ -68,7 +68,7 @@ void {{ object }}Attributes::copy(const
+ 	{% if param.enum  -%}
+ 		{{ param.member }}_ = other.{{ param.member }}_;
+ 	{% else -%}
+- 		{{ param.member }}_ = auto_ptr<{{ param.to }}>(other.{{ param.member }}_->clone());
++ 		{{ param.member }}_ = unique_ptr<{{ param.to }}>(other.{{ param.member }}_->clone());
+ 	{% endif -%}
+ 	{% endfor %}
+ } 

-- 
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