From 195940adc015cc5de6f882709440170fa319acd5 Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Sat, 31 Mar 2012 01:56:55 +0000 Subject: [PATCH] re PR libstdc++/52799 (deque::emplace(iterator, ...) tries to call push_front(...), which doesn't exist) 2012-03-30 Jeffrey Yasskin Paolo Carlini PR libstdc++/52799 * include/bits/deque.tcc (emplace): Fix thinko, replace push_front -> emplace_front, and likewise for *_back. * testsuite/23_containers/deque/modifiers/emplace/52799.cc: New. * testsuite/23_containers/list/modifiers/emplace/52799.cc: Likewise. * testsuite/23_containers/vector/modifiers/emplace/52799.cc: Likewise. Co-Authored-By: Paolo Carlini From-SVN: r186035 --- libstdc++-v3/ChangeLog | 10 ++++++++ libstdc++-v3/include/bits/deque.tcc | 6 ++--- .../23_containers/deque/modifiers/emplace/52799.cc | 28 ++++++++++++++++++++++ .../23_containers/list/modifiers/emplace/52799.cc | 28 ++++++++++++++++++++++ .../vector/modifiers/emplace/52799.cc | 28 ++++++++++++++++++++++ 5 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/52799.cc create mode 100644 libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/52799.cc create mode 100644 libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/52799.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4f29ab4..46923dc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2012-03-30 Jeffrey Yasskin + Paolo Carlini + + PR libstdc++/52799 + * include/bits/deque.tcc (emplace): Fix thinko, replace push_front + -> emplace_front, and likewise for *_back. + * testsuite/23_containers/deque/modifiers/emplace/52799.cc: New. + * testsuite/23_containers/list/modifiers/emplace/52799.cc: Likewise. + * testsuite/23_containers/vector/modifiers/emplace/52799.cc: Likewise. + 2012-03-28 Benjamin Kosnik PR libstdc++/52689 diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc index 5b56875..fcece60 100644 --- a/libstdc++-v3/include/bits/deque.tcc +++ b/libstdc++-v3/include/bits/deque.tcc @@ -1,7 +1,7 @@ // Deque implementation (out of line) -*- C++ -*- // Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -// 2009, 2010, 2011 +// 2009, 2010, 2011, 2012 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -175,12 +175,12 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { if (__position._M_cur == this->_M_impl._M_start._M_cur) { - push_front(std::forward<_Args>(__args)...); + emplace_front(std::forward<_Args>(__args)...); return this->_M_impl._M_start; } else if (__position._M_cur == this->_M_impl._M_finish._M_cur) { - push_back(std::forward<_Args>(__args)...); + emplace_back(std::forward<_Args>(__args)...); iterator __tmp = this->_M_impl._M_finish; --__tmp; return __tmp; diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/52799.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/52799.cc new file mode 100644 index 0000000..35c4c44 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/52799.cc @@ -0,0 +1,28 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2012 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 of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +// libstdc++/52799 +int main() +{ + std::deque d; + d.emplace(d.begin()); +} diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/52799.cc b/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/52799.cc new file mode 100644 index 0000000..314dd4a --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/52799.cc @@ -0,0 +1,28 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2012 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 of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +// libstdc++/52799 +int main() +{ + std::list l; + l.emplace(l.begin()); +} diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/52799.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/52799.cc new file mode 100644 index 0000000..f43057e --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/52799.cc @@ -0,0 +1,28 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2012 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 of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +// libstdc++/52799 +int main() +{ + std::vector v; + v.emplace(v.begin()); +} -- 2.7.4