From c1bd9197ebfc0a8de772dfe5ecd88ceea1e7c18c Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
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/vector | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'libcxx/include/vector')

diff --git a/libcxx/include/vector b/libcxx/include/vector
index 5d41bd11081..1be584d061c 100644
--- a/libcxx/include/vector
+++ b/libcxx/include/vector
@@ -276,11 +276,7 @@ void swap(vector<T,Allocator>& x, vector<T,Allocator>& y)
 
 #include <__undef_min_max>
 
-#ifdef _LIBCPP_DEBUG
-#   include <__debug>
-#else
-#   define _LIBCPP_ASSERT(x, m) ((void)0)
-#endif
+#include <__debug>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
-- 
cgit v1.2.3