diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 10 | ||||
| -rw-r--r-- | libstdc++-v3/include/profile/impl/profiler_node.h | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 978a5076939..e9f1f1b0fd3 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,10 +1,16 @@ -2011-11-08 Jonathan Wakely <jwakely.gcc@gmail.com> +2011-11-07 Paolo Carlini <paolo.carlini@oracle.com> + + PR libstdc++/51018 + * include/profile/impl/profiler_node.h (__stack_hash:: + operator()(__stack_t)): Just use std::size_t everywhere. + +2011-11-07 Jonathan Wakely <jwakely.gcc@gmail.com> * include/std/future (__future_base::_Ptr): Use alias-declaration. (__is_same_pkgdtask): Rename to __constrain_pkgdtask and use decay instead of remove_reference so that cv-quals are removed. -2011-11-08 Ed Smith-Rowland <3dw4rd@verizon.net> +2011-11-07 Ed Smith-Rowland <3dw4rd@verizon.net> * include/precompiled/stdc++.h: Add cstdalign. diff --git a/libstdc++-v3/include/profile/impl/profiler_node.h b/libstdc++-v3/include/profile/impl/profiler_node.h index c32b94e2319..dfaff8c6b6f 100644 --- a/libstdc++-v3/include/profile/impl/profiler_node.h +++ b/libstdc++-v3/include/profile/impl/profiler_node.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Copyright (C) 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011 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 terms @@ -102,10 +102,10 @@ namespace __gnu_profile if (!__s) return 0; - __UINTPTR_TYPE__ __index = 0; + std::size_t __index = 0; __stack_npt::const_iterator __it; for (__it = __s->begin(); __it != __s->end(); ++__it) - __index += reinterpret_cast<__UINTPTR_TYPE__>(*__it); + __index += reinterpret_cast<std::size_t>(*__it); return __index; } |