diff options
| author | Reid Kleckner <reid@kleckner.net> | 2014-02-22 00:37:45 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2014-02-22 00:37:45 +0000 |
| commit | 324eee45a74c13f60e3ef23cfa0990e937996551 (patch) | |
| tree | e4fcf89afcf6cafb842baf2e68c41eaa4908e1cb /compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc | |
| parent | dec8d55b1d947d1174f5a540bb0b14a895ed2cb4 (diff) | |
| download | bcm5719-llvm-324eee45a74c13f60e3ef23cfa0990e937996551.tar.gz bcm5719-llvm-324eee45a74c13f60e3ef23cfa0990e937996551.zip | |
Revert "Replace __FUNCTION__ with __func__, the latter being standard C99/C++11."
This reverts commit r201910.
While __func__ may be standard in C++11, it was only recently added to
MSVC in 2013 CTP, and LLVM supports MSVC 2012. __FUNCTION__ may not be
standard, but it's *very* portable.
llvm-svn: 201916
Diffstat (limited to 'compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc')
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc index c3bdd34eb99..daaf7e1ce05 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc @@ -117,7 +117,7 @@ void *LowLevelAllocator::Allocate(uptr size) { if (allocated_end_ - allocated_current_ < (sptr)size) { uptr size_to_allocate = Max(size, GetPageSizeCached()); allocated_current_ = - (char*)MmapOrDie(size_to_allocate, __func__); + (char*)MmapOrDie(size_to_allocate, __FUNCTION__); allocated_end_ = allocated_current_ + size_to_allocate; if (low_level_alloc_callback) { low_level_alloc_callback((uptr)allocated_current_, |
