diff options
Diffstat (limited to 'test/std/strings/basic.string/string.access/at.pass.cpp')
-rw-r--r-- | test/std/strings/basic.string/string.access/at.pass.cpp | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/test/std/strings/basic.string/string.access/at.pass.cpp b/test/std/strings/basic.string/string.access/at.pass.cpp index 8dc0c57cb7b4..891648930e3c 100644 --- a/test/std/strings/basic.string/string.access/at.pass.cpp +++ b/test/std/strings/basic.string/string.access/at.pass.cpp @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// -// XFAIL: libcpp-no-exceptions // <string> // const_reference at(size_type pos) const; @@ -19,21 +18,41 @@ #include "min_allocator.h" +#include "test_macros.h" + template <class S> void test(S s, typename S::size_type pos) { - try + const S& cs = s; + if (pos < s.size()) { - const S& cs = s; assert(s.at(pos) == s[pos]); assert(cs.at(pos) == cs[pos]); - assert(pos < cs.size()); } - catch (std::out_of_range&) +#ifndef TEST_HAS_NO_EXCEPTIONS + else { - assert(pos >= s.size()); + try + { + s.at(pos); + assert(false); + } + catch (std::out_of_range&) + { + assert(pos >= s.size()); + } + try + { + cs.at(pos); + assert(false); + } + catch (std::out_of_range&) + { + assert(pos >= s.size()); + } } +#endif } int main() |