aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2014-04-15 20:05:57 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2014-04-15 20:05:57 +0100
commitb9de84c92d59581886ab7bfd9934a608854d9992 (patch)
tree7e6328afd85adf6572dcfb65bb3c6c781301729d
parenta1e1bc90cbf0c87b91e33fb0ae42f245b022be7b (diff)
downloadgcc-b9de84c92d59581886ab7bfd9934a608854d9992.zip
gcc-b9de84c92d59581886ab7bfd9934a608854d9992.tar.gz
gcc-b9de84c92d59581886ab7bfd9934a608854d9992.tar.bz2
* include/experimental/string_view: Fix inconsistent exception specs.
From-SVN: r209433
-rw-r--r--libstdc++-v3/ChangeLog2
-rw-r--r--libstdc++-v3/include/experimental/string_view4
2 files changed, 4 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1a40f204..760cdb3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -54,6 +54,8 @@
* testsuite/ext/throw_value/cons.cc: Fix most vexing parse.
* testsuite/util/testsuite_common_types.h: Update comment.
+ * include/experimental/string_view: Fix inconsistent exception specs.
+
2014-04-14 Jonathan Wakely <jwakely@redhat.com>
* include/bits/stl_vector.h (_Vector_base::_Vector_impl,
diff --git a/libstdc++-v3/include/experimental/string_view b/libstdc++-v3/include/experimental/string_view
index bebeb6b..6b6588b 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