From 2cd208c55dc85c20f46b59d1b47e9b8a9d6d1f3f Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@gmail.com>
Date: Sun, 8 Nov 2015 12:41:54 +0000
Subject: [PATCH] Fix ambiguity in IPeakFunctionAdapter inheritance for gcc &
clang
---
.../api/FitFunctions/IFunction1DAdapter.h | 5 ++---
.../api/FitFunctions/IFunctionAdapter.h | 1 -
.../api/FitFunctions/IPeakFunctionAdapter.h | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunction1DAdapter.h b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunction1DAdapter.h
index b8287d0db88..9616b081191 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunction1DAdapter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunction1DAdapter.h
@@ -41,8 +41,8 @@ namespace PythonInterface {
* This is essentially a transparent layer that handles the function calls up
*into Python.
*/
-class IFunction1DAdapter : public API::ParamFunction,
- public API::IFunction1D,
+class IFunction1DAdapter : public virtual API::ParamFunction,
+ public virtual API::IFunction1D,
public IFunctionAdapter {
public:
/// A constructor that looks like a Python __init__ method
@@ -62,7 +62,6 @@ public:
private:
/// The PyObject must be supplied to construct the object
- DISABLE_DEFAULT_CONSTRUCT(IFunction1DAdapter)
DISABLE_COPY_AND_ASSIGN(IFunction1DAdapter)
/// Flag if the functionDeriv1D method is overridden (avoids multiple checks)
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h
index 30479217d15..8118fe2b486 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h
@@ -106,7 +106,6 @@ protected:
private:
/// The PyObject must be supplied to construct the object
- DISABLE_DEFAULT_CONSTRUCT(IFunctionAdapter)
DISABLE_COPY_AND_ASSIGN(IFunctionAdapter)
/// The name of the function
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h
index 4103d443e1e..9db1bee7f03 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h
@@ -87,7 +87,6 @@ public:
private:
/// The PyObject must be supplied to construct the object
- DISABLE_DEFAULT_CONSTRUCT(IPeakFunctionAdapter)
DISABLE_COPY_AND_ASSIGN(IPeakFunctionAdapter)
};
}
--
GitLab