diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-09 17:10:06 -0700 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-09 17:10:06 -0700 |
commit | a997e131d4262f0a18a6f4f8c305c73edbfea6b6 (patch) | |
tree | 5b7f8595e7911f4fd7ba6f2824c6b92f8478a9ef /indra/llxuixml | |
parent | cab31b572d1a3b717b7f8b9fdf2a49f0b2eb6995 (diff) | |
parent | bbf497469c4d71d5308421f1ef06d0a2098772c8 (diff) |
Merge with SVN viewer-2.0.0-3 branch
Diffstat (limited to 'indra/llxuixml')
-rw-r--r-- | indra/llxuixml/llinitparam.cpp | 8 | ||||
-rw-r--r-- | indra/llxuixml/llinitparam.h | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index d35e7b40f8..1b867b79c9 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -517,6 +517,14 @@ namespace LLInitParam } template<> + bool ParamCompare<boost::function<void (void)> >::equals( + const boost::function<void (void)> &a, + const boost::function<void (void)> &b) + { + return false; + } + + template<> bool ParamCompare<LLSD>::equals(const LLSD &a, const LLSD &b) { return false; diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index a1d0831939..baa782916e 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -1815,7 +1815,13 @@ namespace LLInitParam bool ParamCompare<boost::function<void (const LLSD &,const LLSD &)> >::equals( const boost::function<void (const LLSD &,const LLSD &)> &a, const boost::function<void (const LLSD &,const LLSD &)> &b); - + + template<> + bool ParamCompare<boost::function<void (void)> >::equals( + const boost::function<void (void)> &a, + const boost::function<void (void)> &b); + + template<> bool ParamCompare<LLSD>::equals(const LLSD &a, const LLSD &b); } |