summaryrefslogtreecommitdiffstats
path: root/include/system_error
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2013-08-21 02:57:19 +0000
committerMarshall Clow <mclow.lists@gmail.com>2013-08-21 02:57:19 +0000
commit5c316a6d0460054d427aca0344ca5ce0ce3ca182 (patch)
treee72cc1a4958de9fda53949ff43189560847816ec /include/system_error
parent2a34052dacfc7ec689016452bc4b0139a22dbc39 (diff)
downloadexternal_libcxx-5c316a6d0460054d427aca0344ca5ce0ce3ca182.tar.gz
external_libcxx-5c316a6d0460054d427aca0344ca5ce0ce3ca182.tar.bz2
external_libcxx-5c316a6d0460054d427aca0344ca5ce0ce3ca182.zip
LWG 2145 - mark constructor for std::error_category as inline and constexpr. Leave the (existing, out-of-line, non-constexpr) in the dylib for compatibility with existing programs)
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@188858 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/system_error')
-rw-r--r--include/system_error5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/system_error b/include/system_error
index ac3fb4474..df668cc64 100644
--- a/include/system_error
+++ b/include/system_error
@@ -22,6 +22,7 @@ class error_category
public:
virtual ~error_category() noexcept;
+ constexpr error_category();
error_category(const error_category&) = delete;
error_category& operator=(const error_category&) = delete;
@@ -366,7 +367,11 @@ class _LIBCPP_TYPE_VIS error_category
public:
virtual ~error_category() _NOEXCEPT;
+#ifdef _LIBCPP_BUILDING_SYSTEM_ERROR
error_category() _NOEXCEPT;
+#else
+ _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR_AFTER_CXX11 error_category() _NOEXCEPT {}
+#endif
private:
error_category(const error_category&);// = delete;
error_category& operator=(const error_category&);// = delete;