constexpr applied to <complex>.
llvm-svn: 160585
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: f4e11de8e8495aa4e4ea649a9a2ed7c48dede7da
diff --git a/include/complex b/include/complex
index 3b660a3..54dbc25 100644
--- a/include/complex
+++ b/include/complex
@@ -330,13 +330,13 @@
public:
typedef float value_type;
- /*constexpr*/ _LIBCPP_INLINE_VISIBILITY complex(float __re = 0.0f, float __im = 0.0f)
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR complex(float __re = 0.0f, float __im = 0.0f)
: __re_(__re), __im_(__im) {}
- explicit /*constexpr*/ complex(const complex<double>& __c);
- explicit /*constexpr*/ complex(const complex<long double>& __c);
+ explicit _LIBCPP_CONSTEXPR complex(const complex<double>& __c);
+ explicit _LIBCPP_CONSTEXPR complex(const complex<long double>& __c);
- /*constexpr*/ _LIBCPP_INLINE_VISIBILITY float real() const {return __re_;}
- /*constexpr*/ _LIBCPP_INLINE_VISIBILITY float imag() const {return __im_;}
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR float real() const {return __re_;}
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR float imag() const {return __im_;}
_LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
_LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
@@ -386,13 +386,13 @@
public:
typedef double value_type;
- /*constexpr*/ _LIBCPP_INLINE_VISIBILITY complex(double __re = 0.0, double __im = 0.0)
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR complex(double __re = 0.0, double __im = 0.0)
: __re_(__re), __im_(__im) {}
- /*constexpr*/ complex(const complex<float>& __c);
- explicit /*constexpr*/ complex(const complex<long double>& __c);
+ _LIBCPP_CONSTEXPR complex(const complex<float>& __c);
+ explicit _LIBCPP_CONSTEXPR complex(const complex<long double>& __c);
- /*constexpr*/ _LIBCPP_INLINE_VISIBILITY double real() const {return __re_;}
- /*constexpr*/ _LIBCPP_INLINE_VISIBILITY double imag() const {return __im_;}
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR double real() const {return __re_;}
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR double imag() const {return __im_;}
_LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
_LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
@@ -442,13 +442,13 @@
public:
typedef long double value_type;
- /*constexpr*/ _LIBCPP_INLINE_VISIBILITY complex(long double __re = 0.0L, long double __im = 0.0L)
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR complex(long double __re = 0.0L, long double __im = 0.0L)
: __re_(__re), __im_(__im) {}
- /*constexpr*/ complex(const complex<float>& __c);
- /*constexpr*/ complex(const complex<double>& __c);
+ _LIBCPP_CONSTEXPR complex(const complex<float>& __c);
+ _LIBCPP_CONSTEXPR complex(const complex<double>& __c);
- /*constexpr*/ _LIBCPP_INLINE_VISIBILITY long double real() const {return __re_;}
- /*constexpr*/ _LIBCPP_INLINE_VISIBILITY long double imag() const {return __im_;}
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR long double real() const {return __re_;}
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR long double imag() const {return __im_;}
_LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
_LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
@@ -490,33 +490,33 @@
}
};
-//constexpr
inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR
complex<float>::complex(const complex<double>& __c)
: __re_(__c.real()), __im_(__c.imag()) {}
-//constexpr
inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR
complex<float>::complex(const complex<long double>& __c)
: __re_(__c.real()), __im_(__c.imag()) {}
-//constexpr
inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR
complex<double>::complex(const complex<float>& __c)
: __re_(__c.real()), __im_(__c.imag()) {}
-//constexpr
inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR
complex<double>::complex(const complex<long double>& __c)
: __re_(__c.real()), __im_(__c.imag()) {}
-//constexpr
inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR
complex<long double>::complex(const complex<float>& __c)
: __re_(__c.real()), __im_(__c.imag()) {}
-//constexpr
inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR
complex<long double>::complex(const complex<double>& __c)
: __re_(__c.real()), __im_(__c.imag()) {}
diff --git a/test/numerics/complex.number/complex.members/construct.pass.cpp b/test/numerics/complex.number/complex.members/construct.pass.cpp
index 23374c5..b4d870f 100644
--- a/test/numerics/complex.number/complex.members/construct.pass.cpp
+++ b/test/numerics/complex.number/complex.members/construct.pass.cpp
@@ -9,7 +9,7 @@
// <complex>
-// complex(const T& re = T(), const T& im = T());
+// constexpr complex(const T& re = T(), const T& im = T());
#include <complex>
#include <cassert>
@@ -38,6 +38,28 @@
assert(c.real() == 10.5);
assert(c.imag() == -9.5);
}
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+ {
+ constexpr std::complex<T> c;
+ static_assert(c.real() == 0, "");
+ static_assert(c.imag() == 0, "");
+ }
+ {
+ constexpr std::complex<T> c = 7.5;
+ static_assert(c.real() == 7.5, "");
+ static_assert(c.imag() == 0, "");
+ }
+ {
+ constexpr std::complex<T> c(8.5);
+ static_assert(c.real() == 8.5, "");
+ static_assert(c.imag() == 0, "");
+ }
+ {
+ constexpr std::complex<T> c(10.5, -9.5);
+ static_assert(c.real() == 10.5, "");
+ static_assert(c.imag() == -9.5, "");
+ }
+#endif
}
int main()
diff --git a/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp b/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp
index 038e171..e8d07ce 100644
--- a/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp
@@ -20,8 +20,18 @@
int main()
{
+ {
const std::complex<float> cd(2.5, 3.5);
std::complex<double> cf(cd);
assert(cf.real() == cd.real());
assert(cf.imag() == cd.imag());
+ }
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+ {
+ constexpr std::complex<float> cd(2.5, 3.5);
+ constexpr std::complex<double> cf(cd);
+ static_assert(cf.real() == cd.real(), "");
+ static_assert(cf.imag() == cd.imag(), "");
+ }
+#endif
}
diff --git a/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp b/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp
index 197c6ce..298aaa3 100644
--- a/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp
@@ -20,8 +20,18 @@
int main()
{
+ {
const std::complex<float> cd(2.5, 3.5);
std::complex<double> cf = cd;
assert(cf.real() == cd.real());
assert(cf.imag() == cd.imag());
+ }
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+ {
+ constexpr std::complex<float> cd(2.5, 3.5);
+ constexpr std::complex<double> cf = cd;
+ static_assert(cf.real() == cd.real(), "");
+ static_assert(cf.imag() == cd.imag(), "");
+ }
+#endif
}
diff --git a/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp b/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp
index 79c709e..6ff74a2 100644
--- a/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp
@@ -20,8 +20,18 @@
int main()
{
+ {
const std::complex<long double> cd(2.5, 3.5);
std::complex<double> cf(cd);
assert(cf.real() == cd.real());
assert(cf.imag() == cd.imag());
+ }
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+ {
+ constexpr std::complex<long double> cd(2.5, 3.5);
+ constexpr std::complex<double> cf(cd);
+ static_assert(cf.real() == cd.real(), "");
+ static_assert(cf.imag() == cd.imag(), "");
+ }
+#endif
}
diff --git a/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp b/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp
index 01002b3..77ca9d7 100644
--- a/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp
@@ -20,8 +20,18 @@
int main()
{
+ {
const std::complex<double> cd(2.5, 3.5);
std::complex<float> cf(cd);
assert(cf.real() == cd.real());
assert(cf.imag() == cd.imag());
+ }
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+ {
+ constexpr std::complex<double> cd(2.5, 3.5);
+ constexpr std::complex<float> cf(cd);
+ static_assert(cf.real() == cd.real(), "");
+ static_assert(cf.imag() == cd.imag(), "");
+ }
+#endif
}
diff --git a/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp b/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp
index 9203fd5..4fb11b4 100644
--- a/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp
@@ -20,8 +20,18 @@
int main()
{
+ {
const std::complex<long double> cd(2.5, 3.5);
std::complex<float> cf(cd);
assert(cf.real() == cd.real());
assert(cf.imag() == cd.imag());
+ }
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+ {
+ constexpr std::complex<long double> cd(2.5, 3.5);
+ constexpr std::complex<float> cf(cd);
+ static_assert(cf.real() == cd.real(), "");
+ static_assert(cf.imag() == cd.imag(), "");
+ }
+#endif
}
diff --git a/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp b/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp
index b604fd4..dd10c80 100644
--- a/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp
@@ -20,8 +20,18 @@
int main()
{
+ {
const std::complex<double> cd(2.5, 3.5);
std::complex<long double> cf(cd);
assert(cf.real() == cd.real());
assert(cf.imag() == cd.imag());
+ }
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+ {
+ constexpr std::complex<double> cd(2.5, 3.5);
+ constexpr std::complex<long double> cf(cd);
+ static_assert(cf.real() == cd.real(), "");
+ static_assert(cf.imag() == cd.imag(), "");
+ }
+#endif
}
diff --git a/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp b/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp
index 14eff25..aab5394 100644
--- a/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp
@@ -20,8 +20,18 @@
int main()
{
+ {
const std::complex<double> cd(2.5, 3.5);
std::complex<long double> cf = cd;
assert(cf.real() == cd.real());
assert(cf.imag() == cd.imag());
+ }
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+ {
+ constexpr std::complex<double> cd(2.5, 3.5);
+ constexpr std::complex<long double> cf = cd;
+ static_assert(cf.real() == cd.real(), "");
+ static_assert(cf.imag() == cd.imag(), "");
+ }
+#endif
}
diff --git a/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp b/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp
index 5414f34..a5f5101 100644
--- a/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp
@@ -20,8 +20,18 @@
int main()
{
+ {
const std::complex<float> cd(2.5, 3.5);
std::complex<long double> cf(cd);
assert(cf.real() == cd.real());
assert(cf.imag() == cd.imag());
+ }
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+ {
+ constexpr std::complex<float> cd(2.5, 3.5);
+ constexpr std::complex<long double> cf(cd);
+ static_assert(cf.real() == cd.real(), "");
+ static_assert(cf.imag() == cd.imag(), "");
+ }
+#endif
}
diff --git a/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp b/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp
index a002178..25b9382 100644
--- a/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp
@@ -20,8 +20,18 @@
int main()
{
+ {
const std::complex<float> cd(2.5, 3.5);
std::complex<long double> cf = cd;
assert(cf.real() == cd.real());
assert(cf.imag() == cd.imag());
+ }
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+ {
+ constexpr std::complex<float> cd(2.5, 3.5);
+ constexpr std::complex<long double> cf = cd;
+ static_assert(cf.real() == cd.real(), "");
+ static_assert(cf.imag() == cd.imag(), "");
+ }
+#endif
}