summaryrefslogtreecommitdiffstats
path: root/libcxx/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
commitc003db1fcae660d055b1b29852065f67bbabd35e (patch)
treeaf77ff4d08341945ef328dddea31ed7c8919ca82 /libcxx/include/system_error
parentde3a2118db444f4a612ff6b9487face43eb512a6 (diff)
downloadbcm5719-llvm-c003db1fcae660d055b1b29852065f67bbabd35e.tar.gz
bcm5719-llvm-c003db1fcae660d055b1b29852065f67bbabd35e.zip
Further macro protection by replacing _[A-Z] with _[A-Z]p
llvm-svn: 145410
Diffstat (limited to 'libcxx/include/system_error')
-rw-r--r--libcxx/include/system_error24
1 files changed, 12 insertions, 12 deletions
diff --git a/libcxx/include/system_error b/libcxx/include/system_error
index ea96a66c0db..d65b29b1640 100644
--- a/libcxx/include/system_error
+++ b/libcxx/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
OpenPOWER on IntegriCloud