Skip to content
Snippets Groups Projects
Commit 0b96a0e8 authored by Richard Linden's avatar Richard Linden
Browse files

BUILDFIX: corrected template parameter for LL_BAD_TEMPLATE_INSTANTIATION macro in llunit

parent 1f3f660c
Branches
Tags
No related merge requests found
...@@ -132,7 +132,7 @@ struct LLUnit ...@@ -132,7 +132,7 @@ struct LLUnit
void operator *= (self_t multiplicand) void operator *= (self_t multiplicand)
{ {
// spurious use of dependent type to stop gcc from triggering the static assertion before instantiating the template // 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) void operator /= (storage_t divisor)
...@@ -143,7 +143,7 @@ struct LLUnit ...@@ -143,7 +143,7 @@ struct LLUnit
void operator /= (self_t divisor) void operator /= (self_t divisor)
{ {
// spurious use of dependent type to stop gcc from triggering the static assertion before instantiating the template // 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> template<typename SOURCE_STORAGE, typename SOURCE_UNITS>
......
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
#define aprchk(expr) aprchk_(#expr, (expr)) #define aprchk(expr) aprchk_(#expr, (expr))
static void aprchk_(const char* call, apr_status_t rv, apr_status_t expected=APR_SUCCESS) 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); rv, expected);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment