summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorruslantproductengine <ruslantproductengine@lindenlab.com>2015-02-23 12:45:28 +0200
committerruslantproductengine <ruslantproductengine@lindenlab.com>2015-02-23 12:45:28 +0200
commit59fb68799cf61ff1992ead3eb125640c7e8a9db2 (patch)
treefe261fd65feb678db76d50234ba05d8ba2c069dc /indra/llimage
parente664b0e2545f4065a06117b916cb99caf4d9a0f2 (diff)
MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason
Linux & OS X compile error fix
Diffstat (limited to 'indra/llimage')
-rwxr-xr-xindra/llimage/llimage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 2da9aabcd4..0b792af5e9 100755
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -86,7 +86,7 @@
#define UNROLL_GEN_TPL(name, args_seq, operation, spec_seq) \
/*general specialization - should not be implemented!*/ \
- template<U8> struct name { inline void operator()(_UNROL_GEN_TPL_TYPE_ARGS(args_seq)) { boost::static_assert(!"Should not be instantiated."); } }; \
+ template<U8> struct name { inline void operator()(_UNROL_GEN_TPL_TYPE_ARGS(args_seq)) { BOOST_STATIC_ASSERT(!"Should not be instantiated."); } }; \
BOOST_PP_SEQ_FOR_EACH(_UNROLL_GEN_TPL_foreach_seq_macro, (name)(args_seq)(operation), spec_seq)
//..................................................................................
//..................................................................................