From f1b30c41adaeaf5e0ab8dc10e26832789bd08097 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Fri, 13 Feb 2015 22:15:32 +0000
Subject: 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.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@229162 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/__sso_allocator | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/__sso_allocator')

diff --git a/include/__sso_allocator b/include/__sso_allocator
index 645f2ba17..ca3b937c0 100644
--- a/include/__sso_allocator
+++ b/include/__sso_allocator
@@ -15,6 +15,8 @@
 #include <type_traits>
 #include <new>
 
+#include <__undef___deallocate>
+
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif
-- 
cgit v1.2.3