aboutsummaryrefslogtreecommitdiffstats
path: root/src/utils/assert.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-07-09 16:11:46 +0000
committerlloyd <[email protected]>2012-07-09 16:11:46 +0000
commit38f7ed8efb6621d55a705bb7af4ba5a21495113a (patch)
tree0d7bf772ae897e12aca2a2e70257d484a6fdc4dd /src/utils/assert.cpp
parentc9ab9636bc9fa80203b8bd37c20e3817b6013a2d (diff)
Remove BOTAN_ASSERT_FUNCTION, use __func__ which is now standard in C++11
Diffstat (limited to 'src/utils/assert.cpp')
-rw-r--r--src/utils/assert.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/utils/assert.cpp b/src/utils/assert.cpp
index 3747912d6..4b69b4420 100644
--- a/src/utils/assert.cpp
+++ b/src/utils/assert.cpp
@@ -12,7 +12,7 @@
namespace Botan {
void assertion_failure(const char* expr_str,
- const char* msg,
+ const char* assertion_made,
const char* func,
const char* file,
int line)
@@ -21,8 +21,8 @@ void assertion_failure(const char* expr_str,
format << "Assertion " << expr_str << " failed ";
- if(msg && msg[0] != 0)
- format << "(" << msg << ") ";
+ if(assertion_made && assertion_made[0] != 0)
+ format << "(" << assertion_made << ") ";
if(func)
format << "in " << func << " ";