From c3776b1ce07005952aeac4b96ce7f7447d0955d3 Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Sat, 12 Oct 2013 22:49:56 +0000
Subject: [PATCH] LWG Issue 2087: iostream_category() and noexcept

llvm-svn: 192545
---
 libcxx/include/ios | 12 ++++++------
 libcxx/src/ios.cpp |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libcxx/include/ios b/libcxx/include/ios
index 227e39221a98..0dd328d8818c 100644
--- a/libcxx/include/ios
+++ b/libcxx/include/ios
@@ -203,9 +203,9 @@ enum class io_errc
 };
 
 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 @@ struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum<io_errc::__lx> : public true_typ
 #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());
 }
diff --git a/libcxx/src/ios.cpp b/libcxx/src/ios.cpp
index e79b3284cc23..bbe3c072e675 100644
--- a/libcxx/src/ios.cpp
+++ b/libcxx/src/ios.cpp
@@ -63,7 +63,7 @@ __iostream_category::message(int ev) const
 }
 
 const error_category&
-iostream_category()
+iostream_category() _NOEXCEPT
 {
     static __iostream_category s;
     return s;