From 6956abd25f4834e2c451819a57af52874dd0aace Mon Sep 17 00:00:00 2001 From: redi Date: Thu, 26 Sep 2013 19:04:04 +0000 Subject: [PATCH 1/1] Backport from mainline 2013-01-19 Jonathan Wakely PR libstdc++/55861 * include/std/future (_State_base::_S_check(const shared_ptr&)): Fix return type. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@202956 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 10 ++++++++++ libstdc++-v3/include/std/future | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2049b68cec0..19707c2c783 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2013-09-26 Jonathan Wakely + + Backport from mainline + + 2013-01-19 Jonathan Wakely + + PR libstdc++/55861 + * include/std/future (_State_base::_S_check(const shared_ptr&)): + Fix return type. + 2013-09-03 Paolo Carlini PR libstdc++/58302 diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 98c7b843812..150c1afbc4a 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011, 2012, 2013 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 @@ -456,7 +456,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __setter(promise* __prom); template - static bool + static void _S_check(const shared_ptr<_Tp>& __p) { if (!static_cast(__p)) -- 2.11.0