diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-22 12:25:18 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-22 12:25:18 -0800 |
| commit | b2f0d495cd85188e0f9f2d4d363655da40e6e5e6 (patch) | |
| tree | ccc8997361bd66efeea6e7e1502e1b483f04ed7f /src/mmo/ids.hpp | |
| parent | 57e5142d5c9d326912610e3bd60743420f8a328a (diff) | |
| download | tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.tar.gz tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.tar.bz2 tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.tar.xz tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.zip | |
Have I mentioned that I hate ADL?
Diffstat (limited to 'src/mmo/ids.hpp')
| -rw-r--r-- | src/mmo/ids.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mmo/ids.hpp b/src/mmo/ids.hpp index 389f9e9..c1482ef 100644 --- a/src/mmo/ids.hpp +++ b/src/mmo/ids.hpp @@ -30,7 +30,7 @@ class Species : public Wrapped<uint16_t> { public: explicit operator bool() cons constexpr Species NEGATIVE_SPECIES = Species(); -bool extract(XString str, Species *w); +bool impl_extract(XString str, Species *w); class AccountId : public Wrapped<uint32_t> { public: constexpr AccountId() : Wrapped<uint32_t>() {} protected: constexpr explicit AccountId(uint32_t a) : Wrapped<uint32_t>(a) {} }; @@ -41,12 +41,12 @@ class ItemNameId : public Wrapped<uint16_t> { public: constexpr ItemNameId() : W class BlockId : public Wrapped<uint32_t> { public: constexpr BlockId() : Wrapped<uint32_t>() {} protected: constexpr explicit BlockId(uint32_t a) : Wrapped<uint32_t>(a) {} }; -bool extract(XString str, GmLevel *lvl); +bool impl_extract(XString str, GmLevel *lvl); class GmLevel { uint32_t bits; - friend bool extract(XString str, GmLevel *lvl); + friend bool impl_extract(XString str, GmLevel *lvl); constexpr explicit GmLevel(uint32_t b) : bits(b) {} constexpr explicit |