summaryrefslogtreecommitdiff
path: root/lib/asan
diff options
context:
space:
mode:
authorJoerg Sonnenberger <joerg@bec.de>2014-02-21 23:55:15 +0000
committerJoerg Sonnenberger <joerg@bec.de>2014-02-21 23:55:15 +0000
commit792a84022b59c8019a60b7bc8e83387213c04a82 (patch)
treea4ca114e4df4b71f017726396323909c7958619a /lib/asan
parent4733ccad998af454f8f4deca9f371326eb74458f (diff)
Replace __FUNCTION__ with __func__, the latter being standard C99/C++11.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@201910 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan')
-rw-r--r--lib/asan/asan_report.cc2
-rw-r--r--lib/asan/asan_thread.cc2
-rw-r--r--lib/asan/tests/asan_racy_double_free_test.cc4
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/asan/asan_report.cc b/lib/asan/asan_report.cc
index 1af4f7e8a..5e3bccee3 100644
--- a/lib/asan/asan_report.cc
+++ b/lib/asan/asan_report.cc
@@ -835,7 +835,7 @@ void NOINLINE __asan_set_error_report_callback(void (*callback)(const char*)) {
if (callback) {
error_message_buffer_size = 1 << 16;
error_message_buffer =
- (char*)MmapOrDie(error_message_buffer_size, __FUNCTION__);
+ (char*)MmapOrDie(error_message_buffer_size, __func__);
error_message_buffer_pos = 0;
}
}
diff --git a/lib/asan/asan_thread.cc b/lib/asan/asan_thread.cc
index 897ff2e6c..d4e098ac7 100644
--- a/lib/asan/asan_thread.cc
+++ b/lib/asan/asan_thread.cc
@@ -79,7 +79,7 @@ AsanThread *AsanThread::Create(thread_callback_t start_routine,
void *arg) {
uptr PageSize = GetPageSizeCached();
uptr size = RoundUpTo(sizeof(AsanThread), PageSize);
- AsanThread *thread = (AsanThread*)MmapOrDie(size, __FUNCTION__);
+ AsanThread *thread = (AsanThread*)MmapOrDie(size, __func__);
thread->start_routine_ = start_routine;
thread->arg_ = arg;
diff --git a/lib/asan/tests/asan_racy_double_free_test.cc b/lib/asan/tests/asan_racy_double_free_test.cc
index deeeb4f45..23240e714 100644
--- a/lib/asan/tests/asan_racy_double_free_test.cc
+++ b/lib/asan/tests/asan_racy_double_free_test.cc
@@ -7,7 +7,7 @@ void *x[N];
void *Thread1(void *unused) {
for (int i = 0; i < N; i++) {
- fprintf(stderr, "%s %d\n", __FUNCTION__, i);
+ fprintf(stderr, "%s %d\n", __func__, i);
free(x[i]);
}
return NULL;
@@ -15,7 +15,7 @@ void *Thread1(void *unused) {
void *Thread2(void *unused) {
for (int i = 0; i < N; i++) {
- fprintf(stderr, "%s %d\n", __FUNCTION__, i);
+ fprintf(stderr, "%s %d\n", __func__, i);
free(x[i]);
}
return NULL;