diff options
author | Louis Dionne <ldionne.2@gmail.com> | 2021-05-26 15:44:52 -0400 |
---|---|---|
committer | Louis Dionne <ldionne.2@gmail.com> | 2021-05-26 15:45:01 -0400 |
commit | c4823cc5db69f16bb5c96cf7d1b0d070da83605e (patch) | |
tree | 5f406c9841add6039841bdc7ee764878425ded4d /pstl | |
parent | 6c92215e07f41cb566d54599e891180fe2ddbea5 (diff) | |
download | llvm-c4823cc5db69f16bb5c96cf7d1b0d070da83605e.tar.gz |
[pstl] Workaround more errors in the test suite
Diffstat (limited to 'pstl')
3 files changed, 3 insertions, 6 deletions
diff --git a/pstl/include/pstl/internal/pstl_config.h b/pstl/include/pstl/internal/pstl_config.h index 0a5fae878e36..2c68d2872331 100644 --- a/pstl/include/pstl/internal/pstl_config.h +++ b/pstl/include/pstl/internal/pstl_config.h @@ -24,11 +24,7 @@ // Check the user-defined macro for warnings #if defined(PSTL_USAGE_WARNINGS) -# undef _PSTL_USAGE_WARNINGS -# define _PSTL_USAGE_WARNINGS PSTL_USAGE_WARNINGS -// Check the internal macro for warnings -#elif !defined(_PSTL_USAGE_WARNINGS) -# define _PSTL_USAGE_WARNINGS 0 +# define _PSTL_USAGE_WARNINGS #endif #if !defined(_PSTL_ASSERT) diff --git a/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp index 7b9bb1221ee1..9c6ca1ea8c0f 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp @@ -24,6 +24,7 @@ struct copy_int int32_t value; int32_t copied_times = 0; constexpr explicit copy_int(int32_t val = 0) : value(val) {} + constexpr copy_int(copy_int const& other) : value(other.value), copied_times(other.copied_times) { } constexpr copy_int& operator=(const copy_int& other) diff --git a/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp b/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp index 9aec75a9a8e0..f9c4538bf793 100644 --- a/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp @@ -37,7 +37,7 @@ class MyClass int32_t my_field; MyClass() { my_field = 0; } MyClass(int32_t in) { my_field = in; } - MyClass(const MyClass& in) { my_field = in.my_field; } + MyClass(const MyClass& in) = default; friend MyClass operator+(const MyClass& x, const MyClass& y) |