summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-09-12 16:17:15 -0700
committerRichard Linden <none@none>2012-09-12 16:17:15 -0700
commitb26a9ceb2ea3964180b61c784a5673a54b4e7153 (patch)
treea4843fa4b5c10fd5cd9f0a64e739e12a9a16428b /indra/llcommon
parentcd315c0ecdf0dbcc6a5fb18d60cbb31ee06e9acd (diff)
parent56f74728169b1bba0590cb565da043b6c7172675 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llinitparam.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h
index fb12d1df82..0dd6030fa2 100644
--- a/indra/llcommon/llinitparam.h
+++ b/indra/llcommon/llinitparam.h
@@ -224,7 +224,7 @@ namespace LLInitParam
typedef std::map<const std::type_info*, parser_inspect_func_t> parser_inspect_func_map_t;
private:
- template<typename T, bool is_enum = BOOST_IS_ENUM(T)>
+ template<typename T, bool is_enum = boost::is_enum<T>::value>
struct ReaderWriter
{
static bool read(T& param, Parser* parser)