summaryrefslogtreecommitdiff
path: root/src/enums/simpletypes/simpletypes.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/enums/simpletypes/simpletypes.h')
-rw-r--r--src/enums/simpletypes/simpletypes.h27
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);