update

[l4.git] / l4 / pkg / libstdc++-v3 / contrib / libstdc++-v3-4.7 / include / tr1 / functional

diff --git a/l4/pkg/libstdc++-v3/contrib/libstdc++-v3-4.7/include/tr1/functional b/l4/pkg/libstdc++-v3/contrib/libstdc++-v3-4.7/include/tr1/functional
index ff2bd2a7134b2b4acd5a3cc954e617a1f598f9ff..ef1461b694c3207edb1c93a13b2711e9214b0c9a 100644 (file)
--- a/l4/pkg/libstdc++-v3/contrib/libstdc++-v3-4.7/include/tr1/functional
+++ b/l4/pkg/libstdc++-v3/contrib/libstdc++-v3-4.7/include/tr1/functional
@@ -1,6 +1,6 @@
 // TR1 functional header -*- C++ -*-
 
-// Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011
+// Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -1616,7 +1616,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        _M_get_pointer(const _Any_data& __source)
        {
          const _Functor* __ptr =
-           __stored_locally? &__source._M_access<_Functor>()
+           __stored_locally? std::__addressof(__source._M_access<_Functor>())
            /* have stored a pointer */ : __source._M_access<_Functor*>();
          return const_cast<_Functor*>(__ptr);
        }
@@ -1745,8 +1745,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        static void
        _M_init_functor(_Any_data& __functor, reference_wrapper<_Functor> __f)
        {
-         // TBD: Use address_of function instead.
-         _Base::_M_init_functor(__functor, &__f.get());
+         _Base::_M_init_functor(__functor, std::__addressof(__f.get()));
        }
       };