diff options
| author | Richard Linden <none@none> | 2013-08-26 18:37:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-26 18:37:07 -0700 |
| commit | 0b96a0e80c34067056811d100fd5d4e7404e07b5 (patch) | |
| tree | 51e0aac0dff7da59fa10a8cbbb654edea6516a01 | |
| parent | 1f3f660cf4de95fa7e6cbe4015630640aecd22dd (diff) | |
BUILDFIX: corrected template parameter for LL_BAD_TEMPLATE_INSTANTIATION macro in llunit
| -rw-r--r-- | indra/llcommon/llunit.h | 4 | ||||
| -rwxr-xr-x | indra/llcommon/tests/llprocess_test.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/llcommon/llunit.h b/indra/llcommon/llunit.h index 0081b51f84..798d97a46e 100644 --- a/indra/llcommon/llunit.h +++ b/indra/llcommon/llunit.h @@ -132,7 +132,7 @@ struct LLUnit void operator *= (self_t multiplicand) { // spurious use of dependent type to stop gcc from triggering the static assertion before instantiating the template - LL_BAD_TEMPLATE_INSTANTIATION(OTHER_UNIT, "Multiplication of unit types not supported."); + LL_BAD_TEMPLATE_INSTANTIATION(STORAGE_TYPE, "Multiplication of unit types not supported."); } void operator /= (storage_t divisor) @@ -143,7 +143,7 @@ struct LLUnit void operator /= (self_t divisor) { // spurious use of dependent type to stop gcc from triggering the static assertion before instantiating the template - LL_BAD_TEMPLATE_INSTANTIATION(OTHER_UNIT, "Illegal in-place division of unit types."); + LL_BAD_TEMPLATE_INSTANTIATION(STORAGE_TYPE, "Illegal in-place division of unit types."); } template<typename SOURCE_STORAGE, typename SOURCE_UNITS> diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp index 709a095105..e09692c82d 100755 --- a/indra/llcommon/tests/llprocess_test.cpp +++ b/indra/llcommon/tests/llprocess_test.cpp @@ -62,7 +62,8 @@ #define aprchk(expr) aprchk_(#expr, (expr)) static void aprchk_(const char* call, apr_status_t rv, apr_status_t expected=APR_SUCCESS) { - tut::ensure_equals(STRINGIZE(call << " => " << rv << ": " << apr_strerror_helper(rv)), + tut::ensure_equals(STRINGIZE(call << " => " << rv << ": " << apr_strerror_helper + (rv)), rv, expected); } |