diff options
| author | Louis Dionne <ldionne@apple.com> | 2018-07-05 18:41:50 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2018-07-05 18:41:50 +0000 |
| commit | 195a499d638db5157a64c9c816b76154096ecd52 (patch) | |
| tree | cc8b828d9c2b9f596d7ee41600d0c59efcad2867 /libcxx/include/system_error | |
| parent | d8f5b2d612d2d612e9d0503752c00b43ed8f4ba7 (diff) | |
| download | bcm5719-llvm-195a499d638db5157a64c9c816b76154096ecd52.tar.gz bcm5719-llvm-195a499d638db5157a64c9c816b76154096ecd52.zip | |
Revert "[libc++] Replace uses of _LIBCPP_ALWAYS_INLINE by _LIBCPP_INLINE_VISIBILITY"
This reverts commit r336369. The commit had two problems:
1. __pbump was marked as _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY instead of
_LIBCPP_INLINE_VISIBILITY, which lead to two symbols being added in the
dylib and the check-cxx-abilist failing.
2. The LLDB tests started failing because they undefine
`_LIBCPP_INLINE_VISIBILITY`. I need to figure out why they do that and
fix the tests before we can go forward with this change.
llvm-svn: 336382
Diffstat (limited to 'libcxx/include/system_error')
| -rw-r--r-- | libcxx/include/system_error | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libcxx/include/system_error b/libcxx/include/system_error index 917c710290a..f5d8d114562 100644 --- a/libcxx/include/system_error +++ b/libcxx/include/system_error @@ -203,7 +203,7 @@ public: defined(_LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS) error_category() _NOEXCEPT; #else - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR_AFTER_CXX11 error_category() _NOEXCEPT _LIBCPP_DEFAULT #endif private: @@ -217,13 +217,13 @@ public: virtual bool equivalent(const error_code& __code, int __condition) const _NOEXCEPT; virtual string message(int __ev) const = 0; - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE bool operator==(const error_category& __rhs) const _NOEXCEPT {return this == &__rhs;} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE bool operator!=(const error_category& __rhs) const _NOEXCEPT {return !(*this == __rhs);} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE bool operator< (const error_category& __rhs) const _NOEXCEPT {return this < &__rhs;} friend class _LIBCPP_HIDDEN __do_message; @@ -244,21 +244,21 @@ class _LIBCPP_TYPE_VIS error_condition int __val_; const error_category* __cat_; public: - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE error_condition() _NOEXCEPT : __val_(0), __cat_(&generic_category()) {} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE error_condition(int __val, const error_category& __cat) _NOEXCEPT : __val_(__val), __cat_(&__cat) {} template <class _Ep> - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE error_condition(_Ep __e, typename enable_if<is_error_condition_enum<_Ep>::value>::type* = 0 ) _NOEXCEPT {*this = make_error_condition(__e);} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE void assign(int __val, const error_category& __cat) _NOEXCEPT { __val_ = __val; @@ -266,7 +266,7 @@ public: } template <class _Ep> - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE typename enable_if < is_error_condition_enum<_Ep>::value, @@ -275,21 +275,21 @@ public: operator=(_Ep __e) _NOEXCEPT {*this = make_error_condition(__e); return *this;} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE void clear() _NOEXCEPT { __val_ = 0; __cat_ = &generic_category(); } - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE int value() const _NOEXCEPT {return __val_;} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE const error_category& category() const _NOEXCEPT {return *__cat_;} string message() const; - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT {return __val_ != 0;} }; @@ -316,21 +316,21 @@ class _LIBCPP_TYPE_VIS error_code int __val_; const error_category* __cat_; public: - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE error_code() _NOEXCEPT : __val_(0), __cat_(&system_category()) {} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE error_code(int __val, const error_category& __cat) _NOEXCEPT : __val_(__val), __cat_(&__cat) {} template <class _Ep> - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE error_code(_Ep __e, typename enable_if<is_error_code_enum<_Ep>::value>::type* = 0 ) _NOEXCEPT {*this = make_error_code(__e);} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE void assign(int __val, const error_category& __cat) _NOEXCEPT { __val_ = __val; @@ -338,7 +338,7 @@ public: } template <class _Ep> - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE typename enable_if < is_error_code_enum<_Ep>::value, @@ -347,26 +347,26 @@ public: operator=(_Ep __e) _NOEXCEPT {*this = make_error_code(__e); return *this;} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE void clear() _NOEXCEPT { __val_ = 0; __cat_ = &system_category(); } - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE int value() const _NOEXCEPT {return __val_;} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE const error_category& category() const _NOEXCEPT {return *__cat_;} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE error_condition default_error_condition() const _NOEXCEPT {return __cat_->default_error_condition(__val_);} string message() const; - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT {return __val_ != 0;} }; @@ -472,7 +472,7 @@ public: system_error(int __ev, const error_category& __ecat); ~system_error() _NOEXCEPT; - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_ALWAYS_INLINE const error_code& code() const _NOEXCEPT {return __ec_;} private: |

