diff options
Diffstat (limited to 'libcxx/include/ios')
| -rw-r--r-- | libcxx/include/ios | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libcxx/include/ios b/libcxx/include/ios index d8a3643c7ad5..426838b91e5d 100644 --- a/libcxx/include/ios +++ b/libcxx/include/ios @@ -218,6 +218,7 @@ storage-class-specifier const error_category& iostream_category() noexcept; # include <__fwd/ios.h> # include <__ios/fpos.h> # include <__locale> +# include <__memory/addressof.h> # include <__system_error/error_category.h> # include <__system_error/error_code.h> # include <__system_error/error_condition.h> @@ -621,11 +622,11 @@ protected: private: basic_ostream<char_type, traits_type>* __tie_; -#if defined(_LIBCPP_ABI_IOS_ALLOW_ARBITRARY_FILL_VALUE) +# if defined(_LIBCPP_ABI_IOS_ALLOW_ARBITRARY_FILL_VALUE) using _FillType = _FillHelper<traits_type>; -#else +# else using _FillType = _SentinelValueFill<traits_type>; -#endif +# endif mutable _FillType __fill_; }; @@ -640,7 +641,7 @@ basic_ios<_CharT, _Traits>::~basic_ios() {} template <class _CharT, class _Traits> inline _LIBCPP_HIDE_FROM_ABI void basic_ios<_CharT, _Traits>::init(basic_streambuf<char_type, traits_type>* __sb) { ios_base::init(__sb); - __tie_ = nullptr; + __tie_ = nullptr; __fill_.__init(); } @@ -707,7 +708,7 @@ inline _LIBCPP_HIDE_FROM_ABI _CharT basic_ios<_CharT, _Traits>::fill(char_type _ template <class _CharT, class _Traits> basic_ios<_CharT, _Traits>& basic_ios<_CharT, _Traits>::copyfmt(const basic_ios& __rhs) { - if (this != &__rhs) { + if (this != std::addressof(__rhs)) { __call_callbacks(erase_event); ios_base::copyfmt(__rhs); __tie_ = __rhs.__tie_; |