summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/regex.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6f7fada07d9..3bd839fd2ea 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-08 Jonathan Wakely <jwakely@redhat.com>
+
+ * include/bits/regex.h (regex_token_iterator::_M_end_of_seq): Add
+ const qualifier.
+
2014-10-05 François Dumont <fdumont@gcc.gnu.org>
PR libstdc++/63456
diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index 772a209f2bd..fe10ceb96d3 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -2703,7 +2703,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
constexpr bool
- _M_end_of_seq()
+ _M_end_of_seq() const
{ return _M_result == nullptr; }
_Position _M_position;
OpenPOWER on IntegriCloud