diff options
| author | Richard Linden <none@none> | 2013-06-19 12:17:13 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-19 12:17:13 -0700 |
| commit | e62190098b4ffad8be83b54499c61ef645847efd (patch) | |
| tree | 65875e9c3b683a2f2acbacbddbe55ac4e2665286 /indra/llcommon/llerrorlegacy.h | |
| parent | 7d88994edc38cf1c037877a5c7c86e35818b7b79 (diff) | |
BUILDFIX: changed unsupported static_assert to LL_STATIC_ASSERT.
renamed llstatic_assert_template to LL_BAD_TEMPLATE_INSTANTIATION
Diffstat (limited to 'indra/llcommon/llerrorlegacy.h')
| -rwxr-xr-x | indra/llcommon/llerrorlegacy.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llerrorlegacy.h b/indra/llcommon/llerrorlegacy.h index 097a533b1a..50c95339e4 100755 --- a/indra/llcommon/llerrorlegacy.h +++ b/indra/llcommon/llerrorlegacy.h @@ -113,11 +113,11 @@ const int LL_ERR_PRICE_MISMATCH = -23018; #endif #ifdef LL_WINDOWS -#define llstatic_assert(func, msg) static_assert(func, msg) -#define llstatic_assert_template(type, func, msg) static_assert(func, msg) +#define LL_STATIC_ASSERT(func, msg) static_assert(func, msg) +#define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) static_assert(false, msg) #else -#define llstatic_assert(func, msg) BOOST_STATIC_ASSERT(func) -#define llstatic_assert_template(type, func, msg) BOOST_STATIC_ASSERT(sizeof(type) != 0 && func); +#define LL_STATIC_ASSERT(func, msg) BOOST_STATIC_ASSERT(func) +#define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) BOOST_STATIC_ASSERT(sizeof(type) != 0 && false); #endif // handy compile-time assert - enforce those template parameters! |