[ecflow] 08/11: refresh auto_ptr patch

[Alastair McKinstry]

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

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

commit b7e072fa36599db00649b3a413dd111103343d2a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Oct 14 09:47:44 2017 +0100

    refresh auto_ptr patch
---
 debian/patches/auto_ptr.patch | 72 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/debian/patches/auto_ptr.patch b/debian/patches/auto_ptr.patch
index 80828fc..dce5b20 100644
--- a/debian/patches/auto_ptr.patch
+++ b/debian/patches/auto_ptr.patch
@@ -1,6 +1,6 @@
 Description: Drop auto_ptr (deprecated) for unique_ptr, shared_ptr
 Author: Alastair McKinstry <mckinstry at debian.org>
-Last-Updated: 2017-03-22
+Last-Updated: 2017-11-14
 Forwarded: no
 
 Index: ecflow-4.7.0/ANode/src/ExprDuplicate.cpp
@@ -332,3 +332,73 @@ Index: ecflow-4.7.0/ANode/src/Node.cpp
  
     std::string errorMsg;
     if (!check_expressions(ast.get(),expr,trigger,errorMsg)) {
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ ecflow (4.7.0-1) UNRELEASED; urgency=medium
+ .
+   * Compile -fPIC on hppa. Closes: #875464
+   * Standards-Version: 4.1.1; no changes required
+Author: Alastair McKinstry <mckinstry at debian.org>
+Bug-Debian: https://bugs.debian.org/875464
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2017-10-13
+
+Index: ecflow-4.7.0/ANode/src/Node.hpp
+===================================================================
+--- ecflow-4.7.0.orig/ANode/src/Node.hpp
++++ ecflow-4.7.0/ANode/src/Node.hpp
+@@ -578,7 +578,7 @@ public:
+    bool check_expressions(Ast*,const std::string& expr, bool trigger, std::string& errorMsg) const;
+ 
+    /// check trigger expression have nodes and events,meter,repeat that resolve, will throw for error
+-   std::auto_ptr<AstTop> parse_and_check_expressions(const std::string& expr, bool trigger, const std::string& context);
++   std::unique_ptr<AstTop> parse_and_check_expressions(const std::string& expr, bool trigger, const std::string& context);
+ 
+ protected:
+    /// Used in conjunction with Node::position()
+Index: ecflow-4.7.0/ANode/src/Expression.hpp
+===================================================================
+--- ecflow-4.7.0.orig/ANode/src/Expression.hpp
++++ ecflow-4.7.0/ANode/src/Expression.hpp
+@@ -96,10 +96,10 @@ public:
+ 
+    /// Helper function, will parse the expression and return the abstract syntax tree
+ 
+-   static std::auto_ptr<AstTop> parse(
++   static std::unique_ptr<AstTop> parse(
+             const std::string& expression_to_parse,
+             const std::string& error_msg_context); // Will throw for parse errors
+-   static std::auto_ptr<AstTop> parse_no_throw(
++   static std::unique_ptr<AstTop> parse_no_throw(
+             const std::string& expression_to_parse,
+             std::string& error_msg_context);
+ 
+Index: ecflow-4.7.0/Base/src/cts/TaskCmds.cpp
+===================================================================
+--- ecflow-4.7.0.orig/Base/src/cts/TaskCmds.cpp
++++ ecflow-4.7.0/Base/src/cts/TaskCmds.cpp
+@@ -455,7 +455,7 @@ STC_Cmd_ptr CtsWaitCmd::doHandleRequest(
+ 	// If the expression references paths that don't exist throw an error
+ 	// This can be captured in the ecf script, which should then abort the task
+ 	// Otherwise we will end up blocking indefinitely
+-	std::auto_ptr<AstTop> ast = submittable_->parse_and_check_expressions(expression_,true,"CtsWaitCmd:" ); // will throw for errors
++	std::unique_ptr<AstTop> ast = submittable_->parse_and_check_expressions(expression_,true,"CtsWaitCmd:" ); // will throw for errors
+ 
+ 	// Evaluate the expression
+ 	if ( ast->evaluate() ) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ecflow.git