summaryrefslogtreecommitdiffstats
path: root/include/system_error
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-11-29 18:15:50 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-11-29 18:15:50 +0000
commit9996844df0f22a68a1af6d30c611be1f1ebf1486 (patch)
tree6ead68d71db8a19611aceec91fa9395d9d389cf1 /include/system_error
parent66c6f9733b5fde00b3e07602cc8b5eef59c8f514 (diff)
downloadexternal_libcxx-9996844df0f22a68a1af6d30c611be1f1ebf1486.tar.gz
external_libcxx-9996844df0f22a68a1af6d30c611be1f1ebf1486.tar.bz2
external_libcxx-9996844df0f22a68a1af6d30c611be1f1ebf1486.zip
Further macro protection by replacing _[A-Z] with _[A-Z]p
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@145410 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/system_error')
-rw-r--r--include/system_error24
1 files changed, 12 insertions, 12 deletions
diff --git a/include/system_error b/include/system_error
index ea96a66c0..d65b29b16 100644
--- a/include/system_error
+++ b/include/system_error
@@ -419,10 +419,10 @@ public:
error_condition(int __val, const error_category& __cat) _NOEXCEPT
: __val_(__val), __cat_(&__cat) {}
- template <class _E>
+ template <class _Ep>
_LIBCPP_ALWAYS_INLINE
- error_condition(_E __e,
- typename enable_if<is_error_condition_enum<_E>::value>::type* = 0
+ error_condition(_Ep __e,
+ typename enable_if<is_error_condition_enum<_Ep>::value>::type* = 0
) _NOEXCEPT
{*this = make_error_condition(__e);}
@@ -433,14 +433,14 @@ public:
__cat_ = &__cat;
}
- template <class _E>
+ template <class _Ep>
_LIBCPP_ALWAYS_INLINE
typename enable_if
<
- is_error_condition_enum<_E>::value,
+ is_error_condition_enum<_Ep>::value,
error_condition&
>::type
- operator=(_E __e) _NOEXCEPT
+ operator=(_Ep __e) _NOEXCEPT
{*this = make_error_condition(__e); return *this;}
_LIBCPP_ALWAYS_INLINE
@@ -491,10 +491,10 @@ public:
error_code(int __val, const error_category& __cat) _NOEXCEPT
: __val_(__val), __cat_(&__cat) {}
- template <class _E>
+ template <class _Ep>
_LIBCPP_ALWAYS_INLINE
- error_code(_E __e,
- typename enable_if<is_error_code_enum<_E>::value>::type* = 0
+ error_code(_Ep __e,
+ typename enable_if<is_error_code_enum<_Ep>::value>::type* = 0
) _NOEXCEPT
{*this = make_error_code(__e);}
@@ -505,14 +505,14 @@ public:
__cat_ = &__cat;
}
- template <class _E>
+ template <class _Ep>
_LIBCPP_ALWAYS_INLINE
typename enable_if
<
- is_error_code_enum<_E>::value,
+ is_error_code_enum<_Ep>::value,
error_code&
>::type
- operator=(_E __e) _NOEXCEPT
+ operator=(_Ep __e) _NOEXCEPT
{*this = make_error_code(__e); return *this;}
_LIBCPP_ALWAYS_INLINE