[libcxx] r190756 - Marshall Clow: LWG Issue 2056: future_errc enums start with value 0 (invalid value for broken_promise).
Howard Hinnant
hhinnant at apple.com
Sat Sep 14 11:20:11 PDT 2013
Author: hhinnant
Date: Sat Sep 14 13:20:10 2013
New Revision: 190756
URL: http://llvm.org/viewvc/llvm-project?rev=190756&view=rev
Log:
Marshall Clow: LWG Issue 2056: future_errc enums start with value 0 (invalid value for broken_promise).
Modified:
libcxx/trunk/include/future
libcxx/trunk/src/future.cpp
libcxx/trunk/test/thread/futures/futures.overview/future_errc.pass.cpp
Modified: libcxx/trunk/include/future
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/future?rev=190756&r1=190755&r2=190756&view=diff
==============================================================================
--- libcxx/trunk/include/future (original)
+++ libcxx/trunk/include/future Sat Sep 14 13:20:10 2013
@@ -19,10 +19,10 @@ namespace std
enum class future_errc
{
- broken_promise,
- future_already_retrieved,
+ future_already_retrieved = 1,
promise_already_satisfied,
- no_state
+ no_state,
+ broken_promise
};
enum class launch
@@ -379,10 +379,10 @@ _LIBCPP_BEGIN_NAMESPACE_STD
//enum class future_errc
_LIBCPP_DECLARE_STRONG_ENUM(future_errc)
{
- broken_promise,
- future_already_retrieved,
+ future_already_retrieved = 1,
promise_already_satisfied,
- no_state
+ no_state,
+ broken_promise
};
_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(future_errc)
Modified: libcxx/trunk/src/future.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/future.cpp?rev=190756&r1=190755&r2=190756&view=diff
==============================================================================
--- libcxx/trunk/src/future.cpp (original)
+++ libcxx/trunk/src/future.cpp Sat Sep 14 13:20:10 2013
@@ -26,11 +26,15 @@ __future_error_category::name() const _N
return "future";
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wswitch"
+
string
__future_error_category::message(int ev) const
{
switch (static_cast<future_errc>(ev))
{
+ case future_errc(0): // For backwards compatibility with C++11 (LWG 2056)
case future_errc::broken_promise:
return string("The associated promise has been destructed prior "
"to the associated state becoming ready.");
@@ -46,6 +50,8 @@ __future_error_category::message(int ev)
return string("unspecified future_errc value\n");
}
+#pragma clang diagnostic pop
+
const error_category&
future_category() _NOEXCEPT
{
Modified: libcxx/trunk/test/thread/futures/futures.overview/future_errc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/thread/futures/futures.overview/future_errc.pass.cpp?rev=190756&r1=190755&r2=190756&view=diff
==============================================================================
--- libcxx/trunk/test/thread/futures/futures.overview/future_errc.pass.cpp (original)
+++ libcxx/trunk/test/thread/futures/futures.overview/future_errc.pass.cpp Sat Sep 14 13:20:10 2013
@@ -11,18 +11,18 @@
// enum class future_errc
// {
-// broken_promise,
-// future_already_retrieved,
+// future_already_retrieved = 1,
// promise_already_satisfied,
// no_state
+// broken_promise,
// };
#include <future>
int main()
{
- static_assert(static_cast<int>(std::future_errc::broken_promise) == 0, "");
static_assert(static_cast<int>(std::future_errc::future_already_retrieved) == 1, "");
static_assert(static_cast<int>(std::future_errc::promise_already_satisfied) == 2, "");
static_assert(static_cast<int>(std::future_errc::no_state) == 3, "");
+ static_assert(static_cast<int>(std::future_errc::broken_promise) == 4, "");
}
More information about the cfe-commits
mailing list