diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-02-07 15:27:39 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-02-07 15:27:39 +0000 |
| commit | 804f9116e5ed05b5a9f2a3f955c480480967c269 (patch) | |
| tree | 97d28316ead8a5befc7660c073577e8f44beaa1b /libcxx/include/__split_buffer | |
| parent | e94f4c048edba72a276e3632196aa96dbe1ee6a6 (diff) | |
| download | bcm5719-llvm-804f9116e5ed05b5a9f2a3f955c480480967c269.tar.gz bcm5719-llvm-804f9116e5ed05b5a9f2a3f955c480480967c269.zip | |
Michael van der Westhuizen: The attached patch add support for building against libc++abi and libcxxrt to CMake builds of libc++.
Usage (with the appropriate CC and CXX environment variables) is:
$ cmake -DLIBCXX_CXX_ABI=libcxxabi '-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=/home/michael/libcxxabi/include' ../libcxx
and:
$ cmake -DLIBCXX_CXX_ABI=libcxxrt '-DLIBCXX_LIBCXXRT_INCLUDE_PATHS=/home/michael/libcxxrt/src' ../libcxx
llvm-svn: 174623
Diffstat (limited to 'libcxx/include/__split_buffer')
| -rw-r--r-- | libcxx/include/__split_buffer | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/__split_buffer b/libcxx/include/__split_buffer index e0aa13b8988..d498b21eb1d 100644 --- a/libcxx/include/__split_buffer +++ b/libcxx/include/__split_buffer @@ -290,7 +290,7 @@ void __split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, false_type) { while (__begin_ != __new_begin) - __alloc_traits::destroy(__alloc(), __begin_++); + __alloc_traits::destroy(__alloc(), _VSTD::__to_raw_pointer(__begin_++)); } template <class _Tp, class _Allocator> @@ -307,7 +307,7 @@ void __split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, false_type) _NOEXCEPT { while (__new_last != __end_) - __alloc_traits::destroy(__alloc(), --__end_); + __alloc_traits::destroy(__alloc(), _VSTD::__to_raw_pointer(--__end_)); } template <class _Tp, class _Allocator> |
