Skip to content

<complex>: prevent invalid conversions #1294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stephan T. Lavavej (StephanTLavavej) merged 5 commits into from
Sep 23, 2020
Merged

<complex>: prevent invalid conversions #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
795c278
remove some of the constructors
Arzaghi Sep 15, 2020
fb65ae4
remove the FAIL entries
Arzaghi Sep 15, 2020
9d75948
remove skipped_tests entries
Arzaghi Sep 16, 2020
ea77021
remove more unnecessary constructors
Arzaghi Sep 16, 2020
550cc2e
Merge branch 'master' into Fix_Issue1256
StephanTLavavej Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions stl/inc/complex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,17 +694,6 @@ public:
constexpr complex(const _Ty& _Realval = 0, const _Ty& _Imagval = 0)
: _Complex_base<float, _Fcomplex_value>(_Realval, _Imagval) {}

constexpr complex(const _Fcomplex_value& _Right)
: _Complex_base<float, _Fcomplex_value>(_Right._Val[_RE], _Right._Val[_IM]) {}

constexpr complex(const _Dcomplex_value& _Right)
: _Complex_base<float, _Fcomplex_value>(
static_cast<float>(_Right._Val[_RE]), static_cast<float>(_Right._Val[_IM])) {}

constexpr complex(const _Lcomplex_value& _Right)
: _Complex_base<float, _Fcomplex_value>(
static_cast<float>(_Right._Val[_RE]), static_cast<float>(_Right._Val[_IM])) {}

_CONSTEXPR20 complex& operator=(const _Ty& _Right) {
_Val[_RE] = _Right;
_Val[_IM] = 0;
Expand Down Expand Up @@ -797,13 +786,6 @@ public:
constexpr complex(const _Ty& _Realval = 0, const _Ty& _Imagval = 0)
: _Complex_base<double, _Dcomplex_value>(_Realval, _Imagval) {}

constexpr complex(const _Dcomplex_value& _Right)
: _Complex_base<double, _Dcomplex_value>(_Right._Val[_RE], _Right._Val[_IM]) {}

constexpr complex(const _Lcomplex_value& _Right)
: _Complex_base<double, _Dcomplex_value>(
static_cast<double>(_Right._Val[_RE]), static_cast<double>(_Right._Val[_IM])) {}

_CONSTEXPR20 complex& operator=(const _Ty& _Right) {
_Val[_RE] = _Right;
_Val[_IM] = 0;
Expand Down Expand Up @@ -896,9 +878,6 @@ public:
constexpr complex(const _Ty& _Realval = 0, const _Ty& _Imagval = 0)
: _Complex_base<long double, _Lcomplex_value>(_Realval, _Imagval) {}

constexpr complex(const _Lcomplex_value& _Right)
: _Complex_base<long double, _Lcomplex_value>(_Right._Val[_RE], _Right._Val[_IM]) {}

_CONSTEXPR20 complex& operator=(const _Ty& _Right) {
_Val[_RE] = _Right;
_Val[_IM] = 0;
Expand Down
5 changes: 0 additions & 5 deletions tests/libcxx/expected_results.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,11 +527,6 @@ std/localization/locale.categories/category.monetary/locale.moneypunct/money_bas
std/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp FAIL
std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp FAIL

# STL bug: Our inheritance implementation is allowing this to compile when it shouldn't.
Comment thread
StephanTLavavej marked this conversation as resolved.
std/numerics/complex.number/complex.special/double_long_double_implicit.compile.fail.cpp FAIL
std/numerics/complex.number/complex.special/float_double_implicit.compile.fail.cpp FAIL
std/numerics/complex.number/complex.special/float_long_double_implicit.compile.fail.cpp FAIL

# GH-1004 <regex>: Error C2664 in std::regex_traits::transform
std/re/re.traits/transform.pass.cpp FAIL

Expand Down
5 changes: 0 additions & 5 deletions tests/libcxx/skipped_tests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,11 +527,6 @@ localization\locale.categories\category.monetary\locale.moneypunct\money_base.pa
input.output\file.streams\fstreams\filebuf.virtuals\overflow.pass.cpp
input.output\file.streams\fstreams\filebuf.virtuals\underflow.pass.cpp

# STL bug: Our inheritance implementation is allowing this to compile when it shouldn't.
numerics\complex.number\complex.special\double_long_double_implicit.compile.fail.cpp
numerics\complex.number\complex.special\float_double_implicit.compile.fail.cpp
numerics\complex.number\complex.special\float_long_double_implicit.compile.fail.cpp

# GH-1004 <regex>: Error C2664 in std::regex_traits::transform
re\re.traits\transform.pass.cpp

Expand Down