Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[libc++] Make future_error constructor standard-compliant
This patch removes the non compliant constructor of std::future_error and adds the standards compliant constructor in C++17 instead. Note that we can't support the constructor as an extension in all standard modes because it uses delegating constructors, which require C++11. We could in theory support the constructor as an extension in C++11 and C++14 only, however I believe it is acceptable not to do that since I expect the breakage from this patch will be minimal. If it turns out that more code than we expect is broken by this, we can reconsider that decision. This was found during D99515. Differential Revision: https://reviews.llvm.org/D99567 Co-authored-by: Louis Dionne <ldionne.2@gmail.com>
- Loading branch information
Showing
8 changed files
with
143 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
libcxx/test/std/thread/futures/futures.future_error/ctor.pass.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
//===----------------------------------------------------------------------===// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
// | ||
// UNSUPPORTED: no-threads | ||
// UNSUPPORTED: c++03, c++11, c++14 | ||
|
||
// <future> | ||
|
||
// class future_error | ||
// | ||
// explicit future_error(future_errc e); // since C++17 | ||
|
||
#include <cassert> | ||
#include <future> | ||
#include <type_traits> | ||
|
||
int main(int, char**) { | ||
{ | ||
std::future_error f(std::future_errc::broken_promise); | ||
assert(f.code() == std::make_error_code(std::future_errc::broken_promise)); | ||
} | ||
{ | ||
std::future_error f(std::future_errc::future_already_retrieved); | ||
assert(f.code() == std::make_error_code(std::future_errc::future_already_retrieved)); | ||
} | ||
{ | ||
std::future_error f(std::future_errc::promise_already_satisfied); | ||
assert(f.code() == std::make_error_code(std::future_errc::promise_already_satisfied)); | ||
} | ||
{ | ||
std::future_error f(std::future_errc::no_state); | ||
assert(f.code() == std::make_error_code(std::future_errc::no_state)); | ||
} | ||
|
||
// Make sure the constructor is explicit | ||
static_assert(!std::is_convertible_v<std::future_errc, std::future_error>); | ||
|
||
return 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters