diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2014-02-17 22:18:51 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2014-02-17 22:18:51 +0000 |
| commit | 551365da338bb7ef54943cb7e10cf595524d2ff9 (patch) | |
| tree | d981a9111dc5fc559d0ebf42b32e167333157a8e | |
| parent | 3e107b3bd8cb0b51330a39b8fc7f5fb64584069d (diff) | |
| download | bcm5719-llvm-551365da338bb7ef54943cb7e10cf595524d2ff9.tar.gz bcm5719-llvm-551365da338bb7ef54943cb7e10cf595524d2ff9.zip | |
Implement LWG Issue 2346: integral_constant's member functions should be marked noexcept
llvm-svn: 201534
| -rw-r--r-- | libcxx/include/type_traits | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index 3e3d8b7bbce..4f84a0a5db1 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -236,10 +236,10 @@ struct _LIBCPP_TYPE_VIS_ONLY integral_constant typedef _Tp value_type; typedef integral_constant type; _LIBCPP_INLINE_VISIBILITY - _LIBCPP_CONSTEXPR operator value_type() const {return value;} + _LIBCPP_CONSTEXPR operator value_type() const _NOEXCEPT {return value;} #if _LIBCPP_STD_VER > 11 _LIBCPP_INLINE_VISIBILITY - constexpr value_type operator ()() const {return value;} + constexpr value_type operator ()() const _NOEXCEPT {return value;} #endif }; |
