diff options
Diffstat (limited to 'indra/llxuixml')
-rw-r--r-- | indra/llxuixml/llinitparam.cpp | 2 | ||||
-rw-r--r-- | indra/llxuixml/llinitparam.h | 6 | ||||
-rw-r--r-- | indra/llxuixml/lluicolor.cpp | 2 | ||||
-rw-r--r-- | indra/llxuixml/lluicolor.h | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index 1abd411f37..6dd1f93baf 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -500,7 +500,7 @@ namespace LLInitParam return param_changed; } - bool ParamCompare<LLSD, boost::false_type>::equals(const LLSD &a, const LLSD &b) + bool ParamCompare<LLSD, false>::equals(const LLSD &a, const LLSD &b) { return false; } diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 193d8c1f64..b280dfdf63 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -46,7 +46,7 @@ namespace LLInitParam { - template <typename T, typename IS_BOOST_FUNCTION = boost::is_convertible<T, boost::function_base>::type > + template <typename T, bool IS_BOOST_FUNCTION = boost::is_convertible<T, boost::function_base>::value > struct ParamCompare { static bool equals(const T &a, const T &b) @@ -57,7 +57,7 @@ namespace LLInitParam // boost function types are not comparable template<typename T> - struct ParamCompare<T, boost::true_type> + struct ParamCompare<T, true> { static bool equals(const T&a, const T &b) { @@ -1818,7 +1818,7 @@ namespace LLInitParam }; template<> - struct ParamCompare<LLSD, boost::false_type> + struct ParamCompare<LLSD, false> { static bool equals(const LLSD &a, const LLSD &b); }; diff --git a/indra/llxuixml/lluicolor.cpp b/indra/llxuixml/lluicolor.cpp index 0065edb309..856c05cf4a 100644 --- a/indra/llxuixml/lluicolor.cpp +++ b/indra/llxuixml/lluicolor.cpp @@ -58,7 +58,7 @@ bool LLUIColor::isReference() const namespace LLInitParam { // used to detect equivalence with default values on export - bool ParamCompare<LLUIColor, boost::false_type>::equals(const LLUIColor &a, const LLUIColor &b) + bool ParamCompare<LLUIColor, false>::equals(const LLUIColor &a, const LLUIColor &b) { // do not detect value equivalence, treat pointers to colors as distinct from color values return (a.mColorPtr == NULL && b.mColorPtr == NULL ? a.mColor == b.mColor : a.mColorPtr == b.mColorPtr); diff --git a/indra/llxuixml/lluicolor.h b/indra/llxuixml/lluicolor.h index aff81a695d..fb9c6b9161 100644 --- a/indra/llxuixml/lluicolor.h +++ b/indra/llxuixml/lluicolor.h @@ -15,7 +15,7 @@ namespace LLInitParam { - template<typename T, typename IS_BOOST_FUNCTION> + template<typename T, bool> struct ParamCompare; } @@ -37,7 +37,7 @@ public: bool isReference() const; private: - friend struct LLInitParam::ParamCompare<LLUIColor, boost::false_type>; + friend struct LLInitParam::ParamCompare<LLUIColor, false>; const LLColor4* mColorPtr; LLColor4 mColor; @@ -46,7 +46,7 @@ private: namespace LLInitParam { template<> - struct ParamCompare<class LLUIColor, boost::false_type> + struct ParamCompare<LLUIColor, false> { static bool equals(const class LLUIColor& a, const class LLUIColor& b); }; |