summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-08-26 11:23:21 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-08-26 11:23:21 +0000
commit907589bed4408ff3daaa75d7bb10b6d5bec14cd2 (patch)
tree202b93a4d5501c70d7b8348d75b85e38e58c4a60 /libstdc++-v3
parentf90c5ce6f0abbcb2a13b501f26f8f1e25e6451bc (diff)
downloadppe42-gcc-907589bed4408ff3daaa75d7bb10b6d5bec14cd2.tar.gz
ppe42-gcc-907589bed4408ff3daaa75d7bb10b6d5bec14cd2.zip
PR libstdc++/62264
* include/experimental/string_view: Fix inconsistent exception specs. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@214500 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/experimental/string_view4
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e708a482949..dde81bc63a0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-26 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/62264
+ * include/experimental/string_view: Fix inconsistent exception specs.
+
2014-08-09 François Dumont <fdumont@gcc.gnu.org>
PR libstdc++/61667
diff --git a/libstdc++-v3/include/experimental/string_view b/libstdc++-v3/include/experimental/string_view
index e66039e4748..49f46af544f 100644
--- a/libstdc++-v3/include/experimental/string_view
+++ b/libstdc++-v3/include/experimental/string_view
@@ -329,7 +329,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
find(_CharT __c, size_type __pos=0) const noexcept;
size_type
- find(const _CharT* __str, size_type __pos, size_type __n) const;
+ find(const _CharT* __str, size_type __pos, size_type __n) const noexcept;
size_type
find(const _CharT* __str, size_type __pos=0) const noexcept
@@ -343,7 +343,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
rfind(_CharT __c, size_type __pos = npos) const noexcept;
size_type
- rfind(const _CharT* __str, size_type __pos, size_type __n) const;
+ rfind(const _CharT* __str, size_type __pos, size_type __n) const noexcept;
size_type
rfind(const _CharT* __str, size_type __pos = npos) const noexcept
OpenPOWER on IntegriCloud