diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-24 16:04:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-24 16:04:44 +0300 |
commit | 62e97c5ad768880f8b4f0c12c0421b77419732e7 (patch) | |
tree | 622b91f8ecc73a14fbda283d9e0b81db1614d62d /src/enums/simpletypes/simpletypes.h | |
parent | 500bcec44d40ee72873cf16d09c5a0b268825a41 (diff) | |
download | plus-62e97c5ad768880f8b4f0c12c0421b77419732e7.tar.gz plus-62e97c5ad768880f8b4f0c12c0421b77419732e7.tar.bz2 plus-62e97c5ad768880f8b4f0c12c0421b77419732e7.tar.xz plus-62e97c5ad768880f8b4f0c12c0421b77419732e7.zip |
Move defines from simpletypes.h into separate file.
Diffstat (limited to 'src/enums/simpletypes/simpletypes.h')
-rw-r--r-- | src/enums/simpletypes/simpletypes.h | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 2d5514d11..9fb0a553c 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -21,32 +21,9 @@ #ifndef ENUMS_SIMPLETYPES_SIMPLETYPES_H #define ENUMS_SIMPLETYPES_SIMPLETYPES_H -#include "localconsts.h" - -#ifdef ADVGCC - -#define defBoolEnum(name) \ - enum class name : bool \ - { \ - MFalse = false, \ - MTrue = true \ - }; \ - const name name##_true = name::MTrue; \ - const name name##_false = name::MFalse -#define fromBool(val, name) \ - (val) ? name::MTrue : name::MFalse - -#else // ADVGCC - -#define defBoolEnum(name) \ - const bool name##_true = true; \ - const bool name##_false = false; \ - typedef bool name -#define fromBool(val, name) \ - (val) ? true : false - -#endif // ADVGCC +#include "enums/simpletypes/simpledefines.h" +#include "localconsts.h" defBoolEnum(Identified); defBoolEnum(Damaged); |