Commit 9c3aac63 authored by David Fairbrother's avatar David Fairbrother
Browse files

Re #0 Initial MSVC 2017 fixes

parent dd1d9f7f
......@@ -38,9 +38,9 @@ template <class VectorClass> class FortranVector : public VectorClass {
int m_base;
/// Typedef the types returned by the base class's operators []. They aren't
/// necessarily the same as the stored type (double or complex).
typedef decltype(
std::declval<const VectorClass>().operator[](0)) ElementConstType;
typedef decltype(std::declval<VectorClass>().operator[](0)) ElementRefType;
using ElementConstType = decltype(
std::declval<const VectorClass>()[0]);
using ElementRefType = decltype(std::declval<VectorClass>()[0]) ;
public:
/// Constructor
......
......@@ -48,7 +48,7 @@ public:
// MSVC 2015 won't build with noexcept.
// error C2610: 'Mantid::DataObjects::Peak::Peak(Mantid::DataObjects::Peak &&)
// noexcept': is not a special member function which can be defaulted
#if defined(_MSC_VER) && _MSC_VER <= 1900
#if defined(_MSC_VER) && _MSC_VER <= 1910
Peak(Peak &&);
Peak &operator=(Peak &&);
#elif defined(__GNUC__) && (__GNUC__ == 5)
......
......@@ -233,7 +233,7 @@ Peak::Peak(const Geometry::IPeak &ipeak)
}
}
#if defined(_MSC_VER) && _MSC_VER <= 1900
#if defined(_MSC_VER) && _MSC_VER <= 1910
Peak::Peak(Peak &&) = default;
Peak &Peak::operator=(Peak &&) = default;
#elif defined(__GNUC__) && (__GNUC__ == 5)
......
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