diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-28 14:40:25 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-28 14:40:25 +0300 |
| commit | 01773c71a4698c6f01fe70d864f922bda65506cb (patch) | |
| tree | 57e888cf8666ba6e7262adda743a90b8e2fdd619 | |
| parent | 3140513b8ccfcae1663519128dd565116aa35703 (diff) | |
| download | mv-01773c71a4698c6f01fe70d864f922bda65506cb.tar.gz mv-01773c71a4698c6f01fe70d864f922bda65506cb.tar.bz2 mv-01773c71a4698c6f01fe70d864f922bda65506cb.tar.xz mv-01773c71a4698c6f01fe70d864f922bda65506cb.zip | |
Add strong typed defines for strong typed ints.
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/enums/simpletypes/intdefines.h | 42 |
3 files changed, 44 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c23bcfbc6..f84b8fc2b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1066,6 +1066,7 @@ SET(SRCS enums/simpletypes/forcedisplay.h enums/simpletypes/identified.h enums/simpletypes/ignorerecord.h + enums/simpletypes/intdefines.h enums/simpletypes/keep.h enums/simpletypes/modal.h enums/simpletypes/modifiable.h diff --git a/src/Makefile.am b/src/Makefile.am index ee4609a92..98ce8fecc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1195,6 +1195,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/simpletypes/forcedisplay.h \ enums/simpletypes/identified.h \ enums/simpletypes/ignorerecord.h \ + enums/simpletypes/intdefines.h \ enums/simpletypes/keep.h \ enums/simpletypes/modal.h \ enums/simpletypes/modifiable.h \ diff --git a/src/enums/simpletypes/intdefines.h b/src/enums/simpletypes/intdefines.h new file mode 100644 index 000000000..56e052ce3 --- /dev/null +++ b/src/enums/simpletypes/intdefines.h @@ -0,0 +1,42 @@ +/* + * The ManaPlus Client + * Copyright (C) 2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef ENUMS_SIMPLETYPES_INTDEFINES_H +#define ENUMS_SIMPLETYPES_INTDEFINES_H + +#include "localconsts.h" + +#ifdef ADVGCC + +#define defIntEnum(name, type) \ + enum class name : type \ + { \ + }; \ +#define fromInt(val, name) static_cast<name>(val) + +#else // ADVGCC + +#define defIntEnum(name, type) \ + typedef type name +#define fromInt(val, name) (val) + +#endif // ADVGCC + +#endif // ENUMS_SIMPLETYPES_INTDEFINES_H |