diff options
Diffstat (limited to 'libcxx/include/__memory/compressed_pair.h')
| -rw-r--r-- | libcxx/include/__memory/compressed_pair.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libcxx/include/__memory/compressed_pair.h b/libcxx/include/__memory/compressed_pair.h index 08f0318a10f4..fd1fcbe5bf39 100644 --- a/libcxx/include/__memory/compressed_pair.h +++ b/libcxx/include/__memory/compressed_pair.h @@ -20,9 +20,6 @@ #pragma GCC system_header #endif -_LIBCPP_PUSH_MACROS -#include <__undef_macros> - _LIBCPP_BEGIN_NAMESPACE_STD // Tag used to default initialize one or both of the pair's elements. @@ -118,8 +115,8 @@ public: "The current implementation is NOT ABI-compatible with the previous " "implementation for this configuration"); - typedef _LIBCPP_NODEBUG_TYPE __compressed_pair_elem<_T1, 0> _Base1; - typedef _LIBCPP_NODEBUG_TYPE __compressed_pair_elem<_T2, 1> _Base2; + typedef _LIBCPP_NODEBUG __compressed_pair_elem<_T1, 0> _Base1; + typedef _LIBCPP_NODEBUG __compressed_pair_elem<_T2, 1> _Base2; template <bool _Dummy = true, class = typename enable_if< @@ -196,6 +193,4 @@ void swap(__compressed_pair<_T1, _T2>& __x, __compressed_pair<_T1, _T2>& __y) _LIBCPP_END_NAMESPACE_STD -_LIBCPP_POP_MACROS - #endif // _LIBCPP___MEMORY_COMPRESSED_PAIR_H |