summaryrefslogtreecommitdiff
path: root/src/mmo/extract.hpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-07-23 17:05:58 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-08-05 15:59:36 -0700
commit44ba9a9eebec2ffe202fc5594f76864a56f3730a (patch)
tree3788e0507c1a116c45df7a1dd9275784de4d9b5a /src/mmo/extract.hpp
parent738e72ef3b38eef4e0684d49873714a602df53df (diff)
downloadtmwa-44ba9a9eebec2ffe202fc5594f76864a56f3730a.tar.gz
tmwa-44ba9a9eebec2ffe202fc5594f76864a56f3730a.tar.bz2
tmwa-44ba9a9eebec2ffe202fc5594f76864a56f3730a.tar.xz
tmwa-44ba9a9eebec2ffe202fc5594f76864a56f3730a.zip
Enums are not usually integers, sorry
Diffstat (limited to 'src/mmo/extract.hpp')
-rw-r--r--src/mmo/extract.hpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mmo/extract.hpp b/src/mmo/extract.hpp
index 355e2da..ed2eb78 100644
--- a/src/mmo/extract.hpp
+++ b/src/mmo/extract.hpp
@@ -79,9 +79,8 @@ bool extract(XString str, TimeT *tv)
return extract(str, &tv->value);
}
-// extra typename=void to workaround some duplicate overload rule
-template<class T, typename=typename std::enable_if<std::is_enum<T>::value>::type, typename=void>
-bool extract(XString str, T *iv)
+template<class T, typename=typename std::enable_if<std::is_enum<T>::value>::type>
+bool extract_as_int(XString str, T *iv)
{
typedef typename underlying_type<T>::type U;
U v;