commit 61a8422ffa89b7a1788dc9f51407b950ea3b8d0c
author Marshall Clow <mclow.lists@gmail.com> Sat Oct 12 22:49:56 2013 +0000
committer Marshall Clow <mclow.lists@gmail.com> Sat Oct 12 22:49:56 2013 +0000
tree 6b00fbd0c1970445d95df8d74e40a632dacc84bf
parent 5f2d5b95e689a041005d9e4eac41ab6c25e94738

LWG Issue 2087: iostream_category() and noexcept

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@192545 91177308-0d34-0410-b5e6-96231b3b80d8

include/ios

diff --git a/include/ios b/include/ios
index 227e392..0dd328d 100644
--- a/include/ios
+++ b/include/ios
@@ -203,9 +203,9 @@
 };
 
 concept_map ErrorCodeEnum<io_errc> { };
-error_code make_error_code(io_errc e);
-error_condition make_error_condition(io_errc e);
-storage-class-specifier const error_category& iostream_category;
+error_code make_error_code(io_errc e) noexcept; 
+error_condition make_error_condition(io_errc e) noexcept; 
+storage-class-specifier const error_category& iostream_category() noexcept;
 
 }  // std
 
@@ -396,18 +396,18 @@
 #endif
 
 _LIBCPP_FUNC_VIS
-const error_category& iostream_category();
+const error_category& iostream_category() _NOEXCEPT;
 
 inline _LIBCPP_INLINE_VISIBILITY
 error_code
-make_error_code(io_errc __e)
+make_error_code(io_errc __e) _NOEXCEPT
 {
     return error_code(static_cast<int>(__e), iostream_category());
 }
 
 inline _LIBCPP_INLINE_VISIBILITY
 error_condition
-make_error_condition(io_errc __e)
+make_error_condition(io_errc __e) _NOEXCEPT
 {
     return error_condition(static_cast<int>(__e), iostream_category());
 }

src/ios.cpp

diff --git a/src/ios.cpp b/src/ios.cpp
index e79b328..bbe3c07 100644
--- a/src/ios.cpp
+++ b/src/ios.cpp
@@ -63,7 +63,7 @@
 }
 
 const error_category&
-iostream_category()
+iostream_category() _NOEXCEPT
 {
     static __iostream_category s;
     return s;