Automated merge with https://bitbucket.org/lindenlab/viewer-cat

2012-09-12 16:17:15 -07:00 · 2012-09-12 16:17:15 -07:00 · b26a9ceb2e
parent cd315c0ecd 56f7472816
commit b26a9ceb2e
1 changed files with 1 additions and 1 deletions
--- 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)