[ovito] 04/08: Fix compilation with GCC 7. (Closes: #853603)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository ovito.

commit 4cfa51dd49c84ba1560f24d0717821f030cf85de
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Aug 6 19:58:27 2017 +0200

    Fix compilation with GCC 7. (Closes: #853603)
---
 debian/patches/06_fix_gcc7_compiation.patch | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/debian/patches/06_fix_gcc7_compiation.patch b/debian/patches/06_fix_gcc7_compiation.patch
new file mode 100644
index 0000000..684f242
--- /dev/null
+++ b/debian/patches/06_fix_gcc7_compiation.patch
@@ -0,0 +1,30 @@
+Description: Fix compilation with GCC 7.
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/853603
+Last-Update: 2017-08-06
+
+Index: ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/src/core/reference/PropertyField.h
+===================================================================
+--- ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f.orig/src/core/reference/PropertyField.h
++++ ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/src/core/reference/PropertyField.h
+@@ -159,7 +159,7 @@ private:
+ 	// This undo class records a change to the property value.
+ 	class PropertyChangeOperation : public UndoableOperation {
+ 	public:
+-		PropertyChangeOperation(PropertyField& field) : _field(field), _owner(field.owner() != field.owner()->dataset() ? field.owner() : nullptr) {
++		PropertyChangeOperation(PropertyField& field) : _field(field), _owner(field.owner() != static_cast<Ovito::RefMaker*>(field.owner()->dataset()) ? field.owner() : nullptr) {
+ 			// Make a copy of the current property value.
+ 			_oldValue = field;
+ 		}
+Index: ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/src/core/Core.h
+===================================================================
+--- ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f.orig/src/core/Core.h
++++ ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/src/core/Core.h
+@@ -50,6 +50,7 @@
+ #include <atomic>
+ #include <tuple>
+ #include <numeric>
++#include <functional>
+ 
+ /******************************************************************************
+ * QT Library

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