On 29/09/16 13:12 +0100, Jonathan Wakely wrote:
On 29/09/16 14:02 +0200, Rainer Orth wrote:
Hi Jonathan,
If only there was some way the Solaris team could contact us so we
could coordinate and stop adding more and more hacks to mess with each
others headers. But I assume they don't have access to the www or
email, because the only other explanation is too rude to say on a
public list.
Presumably they now provide all the declarations for C++11, so we
don't need to declare them. Moving the new hypot overload outside the
still this doesn't need into <math.h>, but into libstdc++ configury
IMNSHO.
I agree. Presumably they wanted their updated headers to work with
existing GCC releases, and not have to wait until we modified our
configury to cooperate with their changes.
But if they simply communicated with us we could plan for that kind of
thing in advance, and ensure we don't keep trying to fix each others
headers from a distance.
_GLIBCXX_USE_C99_MATH_TR1 block should mean it's declared. That will
break when Solaris adds C++17 support, so we'd better add some macro
to guard the new hypot overloads, so they can be disabled again. Let's
call it __CORRECT_ISO_CPP17_MATH_H_PROTO (and maybe add a coment like
"Dear Solaris team, ...").
... which assumes they do read this ;-)
Indeed.
Since they seem to be adding declarations to <math.h> and only in the
global namespace, and the 3-argument form doesn't exist in the global
namespace, maybe we can assume they aren't going to add it to
<math.h>.
Does this work?
It does indeed, at least running the single testcase with runtest now
passes.
Thanks, I'll commit that soon.
Herre's what I committed, without a CORRECT_ISO_CPP17_MATH_H_PROTO
macro check (which I'd put in the wrong place anyway :-)
Tested powerpc64le-linux, committed to trunk.
commit e253b8464a024a062dc01f0eaad66b10e3132374
Author: Jonathan Wakely <jwak...@redhat.com>
Date: Thu Sep 29 13:41:55 2016 +0100
Define C++17 std::hypot without _GLIBCXX_USE_C99_MATH_TR1
* include/c_global/cmath (hypot, __hypot3): Move C++17 overloads
outside _GLIBCXX_USE_C99_MATH_TR1 condition.
diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath
index fffa0e7..0e7c4ad 100644
--- a/libstdc++-v3/include/c_global/cmath
+++ b/libstdc++-v3/include/c_global/cmath
@@ -1455,46 +1455,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return hypot(__type(__x), __type(__y));
}
-#if __cplusplus > 201402L
-#define __cpp_lib_hypot 201603
- // [c.math.hypot3], three-dimensional hypotenuse
-
- template<typename _Tp>
- inline _Tp
- __hypot3(_Tp __x, _Tp __y, _Tp __z)
- {
- __x = std::abs(__x);
- __y = std::abs(__y);
- __z = std::abs(__z);
- if (_Tp __a = __x < __y ? __y < __z ? __z : __y : __x < __z ? __z : __x)
- return __a * std::sqrt((__x / __a) * (__x / __a)
- + (__y / __a) * (__y / __a)
- + (__z / __a) * (__z / __a));
- else
- return {};
- }
-
- inline float
- hypot(float __x, float __y, float __z)
- { return std::__hypot3<float>(__x, __y, __z); }
-
- inline double
- hypot(double __x, double __y, double __z)
- { return std::__hypot3<double>(__x, __y, __z); }
-
- inline long double
- hypot(long double __x, long double __y, long double __z)
- { return std::__hypot3<long double>(__x, __y, __z); }
-
- template<typename _Tp, typename _Up, typename _Vp>
- typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type
- hypot(_Tp __x, _Up __y, _Vp __z)
- {
- using __type = typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type;
- return std::__hypot3<__type>(__x, __y, __z);
- }
-#endif // C++17
-
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
constexpr int
ilogb(float __x)
@@ -1830,6 +1790,53 @@ _GLIBCXX_END_NAMESPACE_VERSION
#endif // C++11
+#if __cplusplus > 201402L
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ // [c.math.hypot3], three-dimensional hypotenuse
+#define __cpp_lib_hypot 201603
+
+ template<typename _Tp>
+ inline _Tp
+ __hypot3(_Tp __x, _Tp __y, _Tp __z)
+ {
+ __x = std::abs(__x);
+ __y = std::abs(__y);
+ __z = std::abs(__z);
+ if (_Tp __a = __x < __y ? __y < __z ? __z : __y : __x < __z ? __z : __x)
+ return __a * std::sqrt((__x / __a) * (__x / __a)
+ + (__y / __a) * (__y / __a)
+ + (__z / __a) * (__z / __a));
+ else
+ return {};
+ }
+
+ inline float
+ hypot(float __x, float __y, float __z)
+ { return std::__hypot3<float>(__x, __y, __z); }
+
+ inline double
+ hypot(double __x, double __y, double __z)
+ { return std::__hypot3<double>(__x, __y, __z); }
+
+ inline long double
+ hypot(long double __x, long double __y, long double __z)
+ { return std::__hypot3<long double>(__x, __y, __z); }
+
+ template<typename _Tp, typename _Up, typename _Vp>
+ typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type
+ hypot(_Tp __x, _Up __y, _Vp __z)
+ {
+ using __type = typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type;
+ return std::__hypot3<__type>(__x, __y, __z);
+ }
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
+#endif // C++17
+
+
#if _GLIBCXX_USE_STD_SPEC_FUNCS
# include <bits/specfun.h>
#endif
