coffee/better-enums
1
0
Fork 0
mirror of https://github.com/aantron/better-enums.git synced 2025-12-14 15:39:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with missing constructor deletion, removed reference to nullptr.

Browse Source
This commit is contained in:
Anton Bachin 2015-05-24 17:40:12 -05:00
parent 1ad787f94a
commit b4be7537b6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
enum.h
View File

@ -173,7 +173,7 @@ _ENUM_CONSTEXPR inline T _default()
template <>
_ENUM_CONSTEXPR inline const char* _default<const char*>()
{
return nullptr;
return (const char*)0;
}
template <>
@ -629,9 +629,12 @@ _ENUM_CONSTEXPR inline bool operator >=(const Enum &a, const Enum &b) \
// C++98, C++11
#define _ENUM_CXX98_NO_DEFAULT_CONSTRUCTOR(Type) \
private: \
Type() { }
// C++11
#define _ENUM_CXX11_NO_DEFAULT_CONSTRUCTOR(Type) \
Type() = delete;
// C++98, C++11
#define _ENUM_REGULAR_ENUM_SWITCH_TYPE(Type) \
@ -801,7 +804,7 @@ _ENUM_CONSTEXPR inline bool operator >=(const Enum &a, const Enum &b) \
_ENUM_DEFAULT_CALL_INITIALIZE, \
Enum, Integral, __VA_ARGS__)
#define CONSTEXPR_TO_STRING_ENUM(Enum, Integral, ...) \
#define SLOW_ENUM(Enum, Integral, ...) \
_ENUM_TYPE(_ENUM_CXX11_UNDERLYING_TYPE, \
_ENUM_CXX11_NO_DEFAULT_CONSTRUCTOR, \
_ENUM_DEFAULT_SWITCH_TYPE, \