LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the ASAN RAII object a nop when building w/o ASAN

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@217082 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2014-09-03 21:37:43 +00:00
parent 0f4ca8b340
commit 26f472d1dd
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/vector
View File

@@ -863,6 +863,7 @@ private:
__annotate_contiguous_container(data(), data() + capacity(), __annotate_contiguous_container(data(), data() + capacity(),
data() + __old_size, data() + size()); data() + __old_size, data() + size());
} }
#ifndef _LIBCPP_HAS_NO_ASAN
// The annotation for size increase should happen before the actual increase, // The annotation for size increase should happen before the actual increase,
// but if an exception is thrown after that the annotation has to be undone. // but if an exception is thrown after that the annotation has to be undone.
struct __RAII_IncreaseAnnotator { struct __RAII_IncreaseAnnotator {
@@ -879,6 +880,13 @@ private:
size_type __n; size_type __n;
const vector &__v; const vector &__v;
}; };
#else
struct __RAII_IncreaseAnnotator {
inline __RAII_IncreaseAnnotator(const vector &, size_type __n = 1) {}
inline void __done() {}
};
#endif
}; };
template <class _Tp, class _Allocator> template <class _Tp, class _Allocator>