diff options
| author | Eric Fiselier <eric@efcs.ca> | 2014-08-10 23:53:08 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2014-08-10 23:53:08 +0000 |
| commit | c1bd9197ebfc0a8de772dfe5ecd88ceea1e7c18c (patch) | |
| tree | 7796ffd6c6ba5b78fb7b9ab1f36ac4e7c5f6a5fe /libcxx/include/__debug | |
| parent | 3b0e32bf61e45ef2bcfcaa962cad13a081b88b45 (diff) | |
| download | bcm5719-llvm-c1bd9197ebfc0a8de772dfe5ecd88ceea1e7c18c.tar.gz bcm5719-llvm-c1bd9197ebfc0a8de772dfe5ecd88ceea1e7c18c.zip | |
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
Diffstat (limited to 'libcxx/include/__debug')
| -rw-r--r-- | libcxx/include/__debug | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libcxx/include/__debug b/libcxx/include/__debug index f1805adcfe4..c1512246bfc 100644 --- a/libcxx/include/__debug +++ b/libcxx/include/__debug @@ -11,19 +11,23 @@ #ifndef _LIBCPP_DEBUG_H #define _LIBCPP_DEBUG_H +#include <__config> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif #if _LIBCPP_DEBUG_LEVEL >= 1 - # include <cstdlib> # include <cstdio> # include <cstddef> # ifndef _LIBCPP_ASSERT # define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : (_VSTD::printf("%s\n", m), _VSTD::abort())) # endif +#endif +#ifndef _LIBCPP_ASSERT +# define _LIBCPP_ASSERT(x, m) ((void)0) #endif #if _LIBCPP_DEBUG_LEVEL >= 2 |
