diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2015-09-16 22:26:52 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2015-09-16 22:26:52 +0000 |
commit | 854fa44b6f7a32ff94c2a705691da6d3b703574a (patch) | |
tree | aaccdba1a8c990ea730287a164e76e70733b424a /contrib/libc++/include/__undef___deallocate | |
parent | 0e1e5c22c20e636264ff1284083c6af7a1b282cb (diff) | |
parent | 61b9a7258a7693d7f3674a5a1daf7b036ff1d382 (diff) |
Update libc++ to 3.7.0 release.
Notes
Notes:
svn path=/projects/clang370-import/; revision=287877
Diffstat (limited to 'contrib/libc++/include/__undef___deallocate')
-rw-r--r-- | contrib/libc++/include/__undef___deallocate | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/contrib/libc++/include/__undef___deallocate b/contrib/libc++/include/__undef___deallocate new file mode 100644 index 000000000000..2b4ad99dad38 --- /dev/null +++ b/contrib/libc++/include/__undef___deallocate @@ -0,0 +1,18 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifdef __deallocate +#if defined(_MSC_VER) && !defined(__clang__) +_LIBCPP_WARNING("macro __deallocate is incompatible with C++. #undefining __deallocate") +#else +#warning: macro __deallocate is incompatible with C++. #undefining __deallocate +#endif +#undef __deallocate +#endif |