diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-07-23 18:37:53 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-08-05 15:59:36 -0700 |
| commit | 9d7fd8b37f97265f37cc12026e535e953942a1ab (patch) | |
| tree | 709218889e6977f9aeb1b47e9ce42d0e48b88007 /src/io | |
| parent | 44ba9a9eebec2ffe202fc5594f76864a56f3730a (diff) | |
| download | tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.tar.gz tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.tar.bz2 tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.tar.xz tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.zip | |
Move magic to its own namespace
Diffstat (limited to 'src/io')
| -rw-r--r-- | src/io/cxxstdio_enums.hpp | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/src/io/cxxstdio_enums.hpp b/src/io/cxxstdio_enums.hpp index 3a11dde..5424518 100644 --- a/src/io/cxxstdio_enums.hpp +++ b/src/io/cxxstdio_enums.hpp @@ -44,44 +44,49 @@ inline auto decay_for_printf(Option v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } } +namespace magic +{ enum class AREA : uint8_t; -enum class BL : uint8_t; -enum class ByteCode : uint8_t; enum class EFFECT : uint8_t; enum class EXPR : uint8_t; -enum class ItemLook : uint16_t; -enum class MS : uint8_t; -enum class SP : uint16_t; enum class SPELLARG : uint8_t; enum class SPELLGUARD : uint8_t; -enum class SkillID : uint16_t; -enum class StatusChange : uint16_t; enum class TYPE : uint8_t; inline auto decay_for_printf(AREA v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } inline -auto decay_for_printf(BL v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } -inline -auto decay_for_printf(ByteCode v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } -inline auto decay_for_printf(EFFECT v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } inline auto decay_for_printf(EXPR v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } inline +auto decay_for_printf(SPELLARG v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } +inline +auto decay_for_printf(SPELLGUARD v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } +inline +auto decay_for_printf(TYPE v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } +} + +enum class BL : uint8_t; +enum class ByteCode : uint8_t; +enum class ItemLook : uint16_t; +enum class MS : uint8_t; +enum class SP : uint16_t; +enum class SkillID : uint16_t; +enum class StatusChange : uint16_t; + +inline +auto decay_for_printf(BL v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } +inline +auto decay_for_printf(ByteCode v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } +inline auto decay_for_printf(ItemLook v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } inline auto decay_for_printf(MS v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } inline auto decay_for_printf(SP v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } inline -auto decay_for_printf(SPELLARG v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } -inline -auto decay_for_printf(SPELLGUARD v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } -inline auto decay_for_printf(SkillID v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } inline auto decay_for_printf(StatusChange v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } -inline -auto decay_for_printf(TYPE v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } } // namespace tmwa |