diff --git a/include/chaiscript/dispatchkit/any.hpp b/include/chaiscript/dispatchkit/any.hpp index 0abfa37..7c403b7 100644 --- a/include/chaiscript/dispatchkit/any.hpp +++ b/include/chaiscript/dispatchkit/any.hpp @@ -105,8 +105,10 @@ namespace chaiscript { } } +#if _MSC_VER != 1800 Any(Any &&) = default; Any &operator=(Any &&t_any) = default; +#endif template::type>::value>::type> diff --git a/include/chaiscript/dispatchkit/boxed_number.hpp b/include/chaiscript/dispatchkit/boxed_number.hpp index e1a5ca7..62eabe9 100644 --- a/include/chaiscript/dispatchkit/boxed_number.hpp +++ b/include/chaiscript/dispatchkit/boxed_number.hpp @@ -233,7 +233,7 @@ namespace chaiscript template static Boxed_Value oper_rhs(Operators::Opers t_oper, const Boxed_Value &t_lhs, const Boxed_Value &t_rhs) { - const Type_Info &inp_ = t_rhs.get_type_info(); + const auto &inp_ = t_rhs.get_type_info(); if (inp_ == typeid(int)) { return Go::go(t_oper, t_lhs, t_rhs); diff --git a/include/chaiscript/dispatchkit/boxed_value.hpp b/include/chaiscript/dispatchkit/boxed_value.hpp index 6ff5763..466035e 100644 --- a/include/chaiscript/dispatchkit/boxed_value.hpp +++ b/include/chaiscript/dispatchkit/boxed_value.hpp @@ -61,9 +61,10 @@ namespace chaiscript Data(const Data &) = delete; +#if !defined(_MSC_VER) || _MSC_VER != 1800 Data(Data &&) = default; Data &operator=(Data &&rhs) = default; - +#endif Type_Info m_type_info; chaiscript::detail::Any m_obj; @@ -172,9 +173,10 @@ namespace chaiscript { } - +#if !defined(_MSC_VER) || _MSC_VER != 1800 Boxed_Value(Boxed_Value&&) = default; Boxed_Value& operator=(Boxed_Value&&) = default; +#endif Boxed_Value(const Boxed_Value&) = default; Boxed_Value& operator=(const Boxed_Value&) = default; diff --git a/include/chaiscript/dispatchkit/type_info.hpp b/include/chaiscript/dispatchkit/type_info.hpp index f287033..3e129e4 100644 --- a/include/chaiscript/dispatchkit/type_info.hpp +++ b/include/chaiscript/dispatchkit/type_info.hpp @@ -47,8 +47,10 @@ namespace chaiscript { } +#if !defined(_MSC_VER) || _MSC_VER != 1800 Type_Info(Type_Info&&) = default; Type_Info& operator=(Type_Info&&) = default; +#endif Type_Info(const Type_Info&) = default; Type_Info& operator=(const Type_Info&) = default;