Update copyright years.

[thirdparty/gcc.git] / libstdc++-v3 / include / bits / basic_ios.tcc

diff --git a/libstdc++-v3/include/bits/basic_ios.tcc b/libstdc++-v3/include/bits/basic_ios.tcc
index 8a0fe0bb2cc80f02da2987d44adefb5ea13691d2..c8c786f774697949381c9254189c5ff88eb141d7 100644 (file)
--- a/libstdc++-v3/include/bits/basic_ios.tcc
+++ b/libstdc++-v3/include/bits/basic_ios.tcc
@@ -1,7 +1,6 @@
 // basic_ios member functions -*- C++ -*-
 
-// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-// 2009, 2010  Free Software Foundation, Inc.
+// Copyright (C) 1999-2020 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -33,7 +32,9 @@
 
 #pragma GCC system_header
 
-_GLIBCXX_BEGIN_NAMESPACE(std)
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   template<typename _CharT, typename _Traits>
     void
@@ -156,24 +157,23 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     basic_ios<_CharT, _Traits>::_M_cache_locale(const locale& __loc)
     {
       if (__builtin_expect(has_facet<__ctype_type>(__loc), true))
-       _M_ctype = &use_facet<__ctype_type>(__loc);
+       _M_ctype = std::__addressof(use_facet<__ctype_type>(__loc));
       else
        _M_ctype = 0;
 
       if (__builtin_expect(has_facet<__num_put_type>(__loc), true))
-       _M_num_put = &use_facet<__num_put_type>(__loc);
+       _M_num_put = std::__addressof(use_facet<__num_put_type>(__loc));
       else
        _M_num_put = 0;
 
       if (__builtin_expect(has_facet<__num_get_type>(__loc), true))
-       _M_num_get = &use_facet<__num_get_type>(__loc);
+       _M_num_get = std::__addressof(use_facet<__num_get_type>(__loc));
       else
        _M_num_get = 0;
     }
 
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.
-  // NB:  This syntax is a GNU extension.
 #if _GLIBCXX_EXTERN_TEMPLATE
   extern template class basic_ios<char>;
 
@@ -182,6 +182,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 #endif
 #endif
 
-_GLIBCXX_END_NAMESPACE
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace std
 
 #endif