livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for gcc build

meow-7.2.2
Richard Nelson 2009-10-15 21:35:30 +00:00
parent 5debafb966
commit 2ff7f8a772
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llui.cpp
View File

@ -1918,7 +1918,7 @@ namespace LLInitParam
declare("blue", LLColor4::blue);
}
bool ParamCompare<const LLFontGL*, boost::false_type>::equals(const LLFontGL* a, const LLFontGL* b)
bool ParamCompare<const LLFontGL*, false>::equals(const LLFontGL* a, const LLFontGL* b)
{
return !(a->getFontDesc() < b->getFontDesc())
&& !(b->getFontDesc() < a->getFontDesc());

2
indra/llui/llui.h
View File

@ -437,7 +437,7 @@ namespace LLInitParam
};
template<>
struct ParamCompare<const LLFontGL*, boost::false_type>
struct ParamCompare<const LLFontGL*, false>
{
static bool equals(const LLFontGL* a, const LLFontGL* b);
};

2
indra/llui/lluiimage.cpp
View File

@ -152,7 +152,7 @@ namespace LLInitParam
}
bool ParamCompare<LLUIImage*, boost::false_type>::equals(
bool ParamCompare<LLUIImage*, false>::equals(
LLUIImage* const &a,
LLUIImage* const &b)
{

2
indra/llui/lluiimage.h
View File

@ -108,7 +108,7 @@ namespace LLInitParam
// Need custom comparison function for our test app, which only loads
// LLUIImage* as NULL.
template<>
struct ParamCompare<LLUIImage*, boost::false_type>
struct ParamCompare<LLUIImage*, false>
{
static bool equals(LLUIImage* const &a, LLUIImage* const &b);
};

2
indra/llxuixml/llinitparam.cpp
View File

@ -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;
}

6
indra/llxuixml/llinitparam.h
View File

@ -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);
};

2
indra/llxuixml/lluicolor.cpp
View File

@ -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);

6
indra/llxuixml/lluicolor.h
View File

@ -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);
};