From 1fa0adb091eb26ba43064f2ee839fdfffe6290ed Mon Sep 17 00:00:00 2001 From: Thad House Date: Fri, 8 Dec 2017 23:40:35 -0800 Subject: [PATCH] Removes MSVC and GCC old version workarounds (#821) --- wpilibc/src/main/native/include/Base.h | 34 +++----------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/wpilibc/src/main/native/include/Base.h b/wpilibc/src/main/native/include/Base.h index bc51e5347b..e640d838e3 100644 --- a/wpilibc/src/main/native/include/Base.h +++ b/wpilibc/src/main/native/include/Base.h @@ -13,39 +13,13 @@ static_assert(0, "update to the 2018 toolchains."); #endif +#if defined(_MSC_VER) && _MSC_VER < 1900 +static_assert(0, "Visual Studio 2015 or greater required."); +#endif + #include -// MSVC 2013 doesn't allow "= default" on move constructors, but since we are -// (currently) only actually using the move constructors in non-MSVC situations -// (ie, wpilibC++Devices), we can just ignore it in MSVC. -#if defined(_MSC_VER) && _MSC_VER < 1900 -#define DEFAULT_MOVE_CONSTRUCTOR(ClassName) -#else #define DEFAULT_MOVE_CONSTRUCTOR(ClassName) ClassName(ClassName&&) = default -#endif - -#if defined(_MSC_VER) && _MSC_VER < 1900 -#define constexpr const -#endif - -#if (__cplusplus < 201103L) && !defined(_MSC_VER) -#define nullptr NULL -#endif - -#if defined(_MSC_VER) && _MSC_VER < 1900 -#define noexcept throw() -#endif - -// Provide std::decay_t when using GCC < 4.9 -#if defined(__GNUC__) -#if __GNUC__ == 4 && __GNUC_MINOR__ < 9 -#include -namespace std { -template -using decay_t = typename decay::type; -} // namespace std -#endif -#endif namespace frc {