Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Base.h to work properly with MSVC 2015 and above (#513)

Browse Source
This commit is contained in:
Thad House
2017-05-06 21:23:33 -07:00
committed by Peter Johnson
parent 1d025204e7
commit fdd0b853ed
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wpilibc/shared/include/Base.h
View File

@@ -12,20 +12,21 @@
// 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)
#define DEFAULT_MOVE_CONSTRUCTOR(ClassName) ClassName(ClassName&&) = default
#else
#if defined(_MSC_VER) && _MSC_VER < 1900
#define DEFAULT_MOVE_CONSTRUCTOR(ClassName)
#else
#define DEFAULT_MOVE_CONSTRUCTOR(ClassName) ClassName(ClassName&&) = default
#endif
#if (__cplusplus < 201103L)
#if !defined(_MSC_VER)
#define nullptr NULL
#endif
#if defined(_MSC_VER) && _MSC_VER < 1900
#define constexpr const
#endif
#if defined(_MSC_VER)
#if (__cplusplus < 201103L) && !defined(_MSC_VER)
#define nullptr NULL
#endif
#if defined(_MSC_VER) && _MSC_VER < 1900
#define noexcept throw()
#endif