OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compilation error with _GLIBCXX_PARALLEL

Browse Source 
* include/bits/regex_executor.tcc (_Backref_matcher::_M_apply): Use
	_GLIBCXX_STD_A to refer to normal mode algorithms.
	* testsuite/28_regex/headers/regex/parallel_mode.cc: New test.
	* testsuite/28_regex/headers/regex/std_c++0x_neg.cc: Remove empty
	whitespace.

From-SVN: r265314
This commit is contained in:
Jonathan Wakely 2018-10-19 14:46:24 +01:00 committed by Jonathan Wakely
parent 7b1e8acfae
commit 30f7c08d96
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,11 @@
2018-10-19 Jonathan Wakely <jwakely@redhat.com>
* include/bits/regex_executor.tcc (_Backref_matcher::_M_apply): Use
_GLIBCXX_STD_A to refer to normal mode algorithms.
* testsuite/28_regex/headers/regex/parallel_mode.cc: New test.
* testsuite/28_regex/headers/regex/std_c++0x_neg.cc: Remove empty
whitespace.
* include/debug/map.h (map::erase(iterator)): Add abi-tag so that
C++11 version mangles differently from incompatible C++98 version.
* include/debug/multimap.h (multimap::erase(iterator)): Likewise.

4
libstdc++-v3/include/bits/regex_executor.tcc
View File

@ -366,11 +366,11 @@ namespace __detail
_BiIter __actual_end)
{
if (!_M_icase)
return std::__equal4(__expected_begin, __expected_end,
return _GLIBCXX_STD_A::__equal4(__expected_begin, __expected_end,
__actual_begin, __actual_end);
typedef std::ctype<_CharT> __ctype_type;
const auto& __fctyp = use_facet<__ctype_type>(_M_traits.getloc());
return std::__equal4(__expected_begin, __expected_end,
return _GLIBCXX_STD_A::__equal4(__expected_begin, __expected_end,
__actual_begin, __actual_end,
[this, &__fctyp](_CharT __lhs, _CharT __rhs)
{

22
libstdc++-v3/testsuite/28_regex/headers/regex/parallel_mode.cc Normal file
View File

@ -0,0 +1,22 @@
// Copyright (C) 2018 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
// <http://www.gnu.org/licenses/>.
// { dg-do compile { target c++11 } }
// { dg-require-normal-mode "" }
#define _GLIBCXX_PARALLEL
#include <regex>

3
libstdc++-v3/testsuite/28_regex/headers/regex/std_c++0x_neg.cc
View File

@ -21,6 +21,3 @@
#include <regex>
// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 }