coffee/better-enums
1
0
Fork 0
mirror of https://github.com/aantron/better-enums.git synced 2025-12-06 16:56:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix /W4 level warnings in MSVC++ 2015 (#41)

Browse Source 
Remove unused variable names and use underlying class for enum (VS 2012
and above support strongly typed enums and will warn about incorrect
usage).
This commit is contained in:
Anuradha Dissanayake 2017-07-03 03:30:01 +12:00 committed by Anton Bachin
parent 37d8f987ca
commit 6988e0509e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
enum.h
View File

@ -349,7 +349,7 @@ BETTER_ENUMS_CONSTEXPR_ static T* _or_null(optional<T*> maybe)
template <typename T, typename U> template <typename T, typename U>
BETTER_ENUMS_CONSTEXPR_ U BETTER_ENUMS_CONSTEXPR_ U
continue_with(T ignored BETTER_ENUMS_UNUSED, U value) { return value; } continue_with(T, U value) { return value; }
@ -362,7 +362,7 @@ struct _eat_assign {
template <typename Any> template <typename Any>
BETTER_ENUMS_CONSTEXPR_ const _eat_assign& BETTER_ENUMS_CONSTEXPR_ const _eat_assign&
operator =(Any dummy BETTER_ENUMS_UNUSED) const { return *this; } operator =(Any) const { return *this; }
BETTER_ENUMS_CONSTEXPR_ operator EnumType () const { return _value; } BETTER_ENUMS_CONSTEXPR_ operator EnumType () const { return _value; }
@ -886,6 +886,14 @@ operator >>(std::basic_istream<Char, Traits>& stream, Enum &value) \
#define BETTER_ENUMS_CXX11_UNDERLYING_TYPE(Underlying) \ #define BETTER_ENUMS_CXX11_UNDERLYING_TYPE(Underlying) \
: Underlying : Underlying
#if defined(_MSC_VER) && _MSC_VER >= 1700
// VS 2012 and above fully support strongly typed enums and will warn about
// incorrect usage.
# define BETTER_ENUMS_LEGACY_UNDERLYING_TYPE(Underlying) BETTER_ENUMS_CXX11_UNDERLYING_TYPE(Underlying)
#else
# define BETTER_ENUMS_LEGACY_UNDERLYING_TYPE(Underlying) BETTER_ENUMS_CXX98_UNDERLYING_TYPE(Underlying)
#endif
// C++98, C++11 // C++98, C++11
#define BETTER_ENUMS_REGULAR_ENUM_SWITCH_TYPE(Type) \ #define BETTER_ENUMS_REGULAR_ENUM_SWITCH_TYPE(Type) \
_enumerated _enumerated
@ -1102,7 +1110,7 @@ operator >>(std::basic_istream<Char, Traits>& stream, Enum &value) \
#define BETTER_ENUM(Enum, Underlying, ...) \ #define BETTER_ENUM(Enum, Underlying, ...) \
BETTER_ENUMS_ID(BETTER_ENUMS_TYPE( \ BETTER_ENUMS_ID(BETTER_ENUMS_TYPE( \
BETTER_ENUMS_CXX98_UNDERLYING_TYPE, \ BETTER_ENUMS_LEGACY_UNDERLYING_TYPE, \
BETTER_ENUMS_DEFAULT_SWITCH_TYPE, \ BETTER_ENUMS_DEFAULT_SWITCH_TYPE, \
BETTER_ENUMS_DEFAULT_SWITCH_TYPE_GENERATE, \ BETTER_ENUMS_DEFAULT_SWITCH_TYPE_GENERATE, \
BETTER_ENUMS_CXX98_TRIM_STRINGS_ARRAYS, \ BETTER_ENUMS_CXX98_TRIM_STRINGS_ARRAYS, \