summaryrefslogtreecommitdiffstats
path: root/libcxx/include/ios
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2013-10-12 22:49:56 +0000
committerMarshall Clow <mclow.lists@gmail.com>2013-10-12 22:49:56 +0000
commitc3776b1ce07005952aeac4b96ce7f7447d0955d3 (patch)
treee133b6524944581576c4f0a34ae26669db60c2b9 /libcxx/include/ios
parentd58daf94337f5e06d867c64869f2763e73f01df2 (diff)
downloadbcm5719-llvm-c3776b1ce07005952aeac4b96ce7f7447d0955d3.tar.gz
bcm5719-llvm-c3776b1ce07005952aeac4b96ce7f7447d0955d3.zip
LWG Issue 2087: iostream_category() and noexcept
llvm-svn: 192545
Diffstat (limited to 'libcxx/include/ios')
-rw-r--r--libcxx/include/ios12
1 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/include/ios b/libcxx/include/ios
index 227e39221a9..0dd328d8818 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());
}
OpenPOWER on IntegriCloud