diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-02-13 22:15:32 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-02-13 22:15:32 +0000 |
| commit | 8e5ce331936f46e259acc03a81fd7d105429cc30 (patch) | |
| tree | c9ca038b63e6cb3e4c0ba3c3d2f6adbbb8c365fe /libcxx/include/valarray | |
| parent | 4ef8ac946c577bafddcb211a3dbab6b3dcf66e08 (diff) | |
| download | bcm5719-llvm-8e5ce331936f46e259acc03a81fd7d105429cc30.tar.gz bcm5719-llvm-8e5ce331936f46e259acc03a81fd7d105429cc30.zip | |
Handle function name conflicts in _LIBCPP_MSVCRT mode
Visual Studio's SAL extension uses a macro named __deallocate. This macro is
used pervasively, and gets included through various different ways. This
conflicts with the similarly named interfaces in libc++. Introduce a undef
header similar to __undef_min_max to handle this. This fixes a number of errors
due to the macro replacing the function name.
llvm-svn: 229162
Diffstat (limited to 'libcxx/include/valarray')
| -rw-r--r-- | libcxx/include/valarray | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libcxx/include/valarray b/libcxx/include/valarray index 2b942046db9..bdaa58836f3 100644 --- a/libcxx/include/valarray +++ b/libcxx/include/valarray @@ -348,6 +348,7 @@ template <class T> unspecified2 end(const valarray<T>& v); #include <new> #include <__undef_min_max> +#include <__undef___deallocate> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header |
