[ecflow] 46/50: gcc7-fixes.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 9e538746ac2a7e717a4007c8444664ae49e032da
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Sep 9 18:45:34 2017 +0100

    gcc7-fixes.patch
---
 debian/patches/gcc7-fixes.patch | 76 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  2 +-
 3 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/debian/patches/gcc7-fixes.patch b/debian/patches/gcc7-fixes.patch
new file mode 100644
index 0000000..c07260b
--- /dev/null
+++ b/debian/patches/gcc7-fixes.patch
@@ -0,0 +1,76 @@
+Index: ecflow-4.6.1/view/src/host.cc
+===================================================================
+--- ecflow-4.6.1.orig/view/src/host.cc
++++ ecflow-4.6.1/view/src/host.cc
+@@ -261,12 +261,13 @@ void host::logout( const std::string& na
+    if (h) h->logout();
+ }
+ 
++
+ host* host::find( const std::string& machine, int number )
+ {
+    host *h = extent < host > ::first();
+    while ( h ) {
+       if (h->host_ == machine && h->number_ == number) return h;
+-      h = h->extent < host > ::next();
++      h = h->  next();
+    }
+    return 0x0;
+ }
+@@ -276,7 +277,7 @@ host* host::find( const std::string& nam
+    host *h = extent < host > ::first();
+    while ( h ) {
+       if (h->name() && h->name() == name) return h;
+-      h = h->extent < host > ::next();
++      h = h->next();
+    }
+    return 0;
+ }
+@@ -296,7 +297,7 @@ void host::status( Boolean force )
+    while ( h ) {
+       if (force) h->reset(force);
+       h->status();
+-      h = h->extent < host > ::next();
++      h = h->next();
+    }
+ }
+ 
+@@ -305,7 +306,7 @@ void host::redraw_all()
+    host *h = extent < host > ::first();
+    while ( h ) {
+       h->redraw();
+-      h = h->extent < host > ::next();
++      h = h->next();
+    }
+ }
+ 
+@@ -742,7 +743,7 @@ void host::check_all_mail()
+    host *h = extent < host > ::first();
+    while ( h ) {
+       h->check_mail();
+-      h = h->extent < host > ::next();
++      h = h->next();
+    }
+ }
+ 
+@@ -1204,7 +1205,7 @@ void host::hosts( host_lister& l )
+    host *h = extent < host > ::first();
+    while ( h ) {
+       l.next(*h);
+-      h = h->extent < host > ::next();
++      h = h->next();
+    }
+ }
+ 
+Index: ecflow-4.6.1/view/src/host.h
+===================================================================
+--- ecflow-4.6.1.orig/view/src/host.h
++++ ecflow-4.6.1/view/src/host.h
+@@ -104,6 +104,7 @@ class host : public extent<host>
+   , public configurable
+   , public observable 
+ {
++  using extent<host> :: next;
+  public:
+ 	static void status(Boolean);
+ 	static void login(const std::string&,int);
diff --git a/debian/patches/series b/debian/patches/series
index 06b0eaf..fcdd1ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ reproducible.patch
 minver.patch
 soname.patch
 set-paths.patch
+gcc7-fixes.patch
diff --git a/debian/rules b/debian/rules
index 5fb1b8e..7bfcf47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DH_VERBOSE=1
 %:
 	dh $@ --parallel --with python2,python3 --with-buildsystem=cmake
 
-export CXX=g++-6
+# export CXX=g++-6
 
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -DNO_REGEXP
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)

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