From: Tim Shen <timshen@google.com>
To: "libstdc++" <libstdc++@gcc.gnu.org>,
gcc-patches <gcc-patches@gcc.gnu.org>
Subject: [Patch, libstdc++/64239] Use std::swap instead of swap in regex
Date: Wed, 07 Jan 2015 05:03:00 -0000 [thread overview]
Message-ID: <CAG4ZjN=UdMVQUw2qmT0jCnqfn_Ed-yqCjRPG18HzrnLE-o3p7w@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 98 bytes --]
Bootstrapped and tested. It could be also patched to 4.9 branch.
Thanks!
--
Regards,
Tim Shen
[-- Attachment #2: a.diff --]
[-- Type: text/plain, Size: 1225 bytes --]
commit dfe3a26759893849020a659b14fafe8b27e90dae
Author: timshen <timshen@google.com>
Date: Tue Jan 6 19:30:27 2015 -0800
PR libstdc++/64239
* include/bits/regex.h (match_results<>::swap): Use std::swap
instead of swap.
* include/bits/regex_compiler.tcc (_Compiler<>::_M_quantifier):
Likewise.
diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index 9b7ed8c..b520039 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -1864,7 +1864,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
swap(match_results& __that)
{
_Base_type::swap(__that);
- swap(_M_begin, __that._M_begin);
+ std::swap(_M_begin, __that._M_begin);
}
//@}
diff --git a/libstdc++-v3/include/bits/regex_compiler.tcc b/libstdc++-v3/include/bits/regex_compiler.tcc
index 57bafa3..33d7118 100644
--- a/libstdc++-v3/include/bits/regex_compiler.tcc
+++ b/libstdc++-v3/include/bits/regex_compiler.tcc
@@ -276,7 +276,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
auto& __tmp = (*_M_nfa)[__stack.top()];
__stack.pop();
- swap(__tmp._M_next, __tmp._M_alt);
+ std::swap(__tmp._M_next, __tmp._M_alt);
}
}
_M_stack.push(__e);
next reply other threads:[~2015-01-07 5:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-07 5:03 Tim Shen [this message]
2015-01-07 12:39 ` Jonathan Wakely
2015-01-08 19:44 ` Tim Shen
2015-01-09 0:42 ` Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAG4ZjN=UdMVQUw2qmT0jCnqfn_Ed-yqCjRPG18HzrnLE-o3p7w@mail.gmail.com' \
--to=timshen@google.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).