Commit 3c9ebb77 authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony
Browse files

API + tests compile and pass

Removed virtual specifier on MultiDomainFunctionTest_Function that caused
a crash and is unnecessary as the appropriate bases classes inherit
virtually.
parent 5705027e
......@@ -63,10 +63,10 @@ FrameworkManagerImpl::FrameworkManagerImpl()
WSAStartup(MAKEWORD(2, 2), &wsaData);
#endif
#ifdef _MSC_VER
// This causes the exponent to consist of two digits (Windows Visual Studio
// normally 3, Linux default 2), where two digits are not sufficient I presume
// it uses more
#if defined(_MSC_VER) && _MSC_VER < 1900
// This causes the exponent to consist of two digits.
// VC++ >=1900 use standards conforming behaviour and only
// uses the number of digits required
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
......
......@@ -16,8 +16,8 @@
using namespace Mantid;
using namespace Mantid::API;
class MultiDomainFunctionTest_Function : public virtual IFunction1D,
public virtual ParamFunction {
class MultiDomainFunctionTest_Function : public IFunction1D,
public ParamFunction {
public:
MultiDomainFunctionTest_Function() : IFunction1D(), ParamFunction() {
this->declareParameter("A", 0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment