diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2014-02-26 20:33:22 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2014-02-26 20:33:22 +0000 |
| commit | 0fc6894b9ebf39eaf0f06712815c0b705dbc2624 (patch) | |
| tree | 7799c19ee9a43a40fa2533d8432c7048301f8845 /lib/sanitizer_common/sanitizer_allocator.cc | |
| parent | 16fc5c924d3b984288a689c967dfc2c35ac8bc22 (diff) | |
Reapply r201910. MSVC gets __func__ defined explicitly, even though it
can't build anything here.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@202297 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_allocator.cc')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_allocator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc index daaf7e1ce..c3bdd34eb 100644 --- a/lib/sanitizer_common/sanitizer_allocator.cc +++ b/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, __FUNCTION__); + (char*)MmapOrDie(size_to_allocate, __func__); allocated_end_ = allocated_current_ + size_to_allocate; if (low_level_alloc_callback) { low_level_alloc_callback((uptr)allocated_current_, |