From c1bd9197ebfc0a8de772dfe5ecd88ceea1e7c18c Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sun, 10 Aug 2014 23:53:08 +0000 Subject: NFC. Move definition of _LIBCPP_ASSERT into __debug header and remove external include guards. Things done in this patch: 1. Make __debug include __config since it uses macros from it. 2. The current method of defining _LIBCPP_ASSERT is prone to redefinitions. Move the null _LIBCPP_ASSERT definition into the __debug header to prevent this. 3. Remove external <__debug> include gaurds. <__debug> guards almost all of its contents internally. There is no reason to be doing it externally. This patch should not change any functionality. llvm-svn: 215332 --- libcxx/include/experimental/string_view | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libcxx/include/experimental/string_view') diff --git a/libcxx/include/experimental/string_view b/libcxx/include/experimental/string_view index 3147e221e62..b0382e5d257 100644 --- a/libcxx/include/experimental/string_view +++ b/libcxx/include/experimental/string_view @@ -182,6 +182,8 @@ namespace std { #include #include +#include <__debug> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif -- cgit v1.2.3