Skip to content

R
riscv-gcc-1
Commit 54f38225 by Paolo Carlini Committed by Paolo Carlini
Options

re PR libstdc++/27340 (valarray uses __cos which may conflict with libm functions) 

2010-02-06  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/27340
	* include/bits/valarray_before.h: Uglify the structs wrapping
	cmath functions differently, eg, _Cos instead of __cos.
	* include/bits/valarray_after.h: Adjust.

From-SVN: r156555
parent 9d3b08c6
Showing with 66 additions and 58 deletions
libstdc++-v3/ChangeLog
2010-02-06 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/27340
* include/bits/valarray_before.h: Uglify the structs wrapping
cmath functions differently, eg, _Cos instead of __cos.
* include/bits/valarray_after.h: Adjust.
2010-02-05 Paolo Carlini <paolo.carlini@oracle.com> 2010-02-05 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/future (swap(packaged_task<>&, packaged_task<>&)): Fix * include/std/future (swap(packaged_task<>&, packaged_task<>&)): Fix
......
libstdc++-v3/include/bits/valarray_after.h
// The template and inlines for the -*- C++ -*- internal _Meta class. // The template and inlines for the -*- C++ -*- internal _Meta class.
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
// 2009 Free Software Foundation, Inc. // 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
...@@ -419,128 +419,128 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -419,128 +419,128 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
#undef _DEFINE_EXPR_BINARY_OPERATOR #undef _DEFINE_EXPR_BINARY_OPERATOR
#define _DEFINE_EXPR_UNARY_FUNCTION(_Name) \ #define _DEFINE_EXPR_UNARY_FUNCTION(_Name, _UName) \
template<class _Dom> \ template<class _Dom> \
inline _Expr<_UnClos<__##_Name, _Expr, _Dom>, \ inline _Expr<_UnClos<_UName, _Expr, _Dom>, \
typename _Dom::value_type> \ typename _Dom::value_type> \
_Name(const _Expr<_Dom, typename _Dom::value_type>& __e) \ _Name(const _Expr<_Dom, typename _Dom::value_type>& __e) \
{ \ { \
typedef typename _Dom::value_type _Tp; \ typedef typename _Dom::value_type _Tp; \
typedef _UnClos<__##_Name, _Expr, _Dom> _Closure; \ typedef _UnClos<_UName, _Expr, _Dom> _Closure; \
return _Expr<_Closure, _Tp>(_Closure(__e())); \ return _Expr<_Closure, _Tp>(_Closure(__e())); \
} \ } \
\ \
template<typename _Tp> \ template<typename _Tp> \
inline _Expr<_UnClos<__##_Name, _ValArray, _Tp>, _Tp> \ inline _Expr<_UnClos<_UName, _ValArray, _Tp>, _Tp> \
_Name(const valarray<_Tp>& __v) \ _Name(const valarray<_Tp>& __v) \
{ \ { \
typedef _UnClos<__##_Name, _ValArray, _Tp> _Closure; \ typedef _UnClos<_UName, _ValArray, _Tp> _Closure; \
return _Expr<_Closure, _Tp>(_Closure(__v)); \ return _Expr<_Closure, _Tp>(_Closure(__v)); \
} }
_DEFINE_EXPR_UNARY_FUNCTION(abs) _DEFINE_EXPR_UNARY_FUNCTION(abs, _Abs)
_DEFINE_EXPR_UNARY_FUNCTION(cos) _DEFINE_EXPR_UNARY_FUNCTION(cos, _Cos)
_DEFINE_EXPR_UNARY_FUNCTION(acos) _DEFINE_EXPR_UNARY_FUNCTION(acos, _Acos)
_DEFINE_EXPR_UNARY_FUNCTION(cosh) _DEFINE_EXPR_UNARY_FUNCTION(cosh, _Cosh)
_DEFINE_EXPR_UNARY_FUNCTION(sin) _DEFINE_EXPR_UNARY_FUNCTION(sin, _Sin)
_DEFINE_EXPR_UNARY_FUNCTION(asin) _DEFINE_EXPR_UNARY_FUNCTION(asin, _Asin)
_DEFINE_EXPR_UNARY_FUNCTION(sinh) _DEFINE_EXPR_UNARY_FUNCTION(sinh, _Sinh)
_DEFINE_EXPR_UNARY_FUNCTION(tan) _DEFINE_EXPR_UNARY_FUNCTION(tan, _Tan)
_DEFINE_EXPR_UNARY_FUNCTION(tanh) _DEFINE_EXPR_UNARY_FUNCTION(tanh, _Tanh)
_DEFINE_EXPR_UNARY_FUNCTION(atan) _DEFINE_EXPR_UNARY_FUNCTION(atan, _Atan)
_DEFINE_EXPR_UNARY_FUNCTION(exp) _DEFINE_EXPR_UNARY_FUNCTION(exp, _Exp)
_DEFINE_EXPR_UNARY_FUNCTION(log) _DEFINE_EXPR_UNARY_FUNCTION(log, _Log)
_DEFINE_EXPR_UNARY_FUNCTION(log10) _DEFINE_EXPR_UNARY_FUNCTION(log10, _Log10)
_DEFINE_EXPR_UNARY_FUNCTION(sqrt) _DEFINE_EXPR_UNARY_FUNCTION(sqrt, _Sqrt)
#undef _DEFINE_EXPR_UNARY_FUNCTION #undef _DEFINE_EXPR_UNARY_FUNCTION
#define _DEFINE_EXPR_BINARY_FUNCTION(_Fun) \ #define _DEFINE_EXPR_BINARY_FUNCTION(_Fun, _UFun) \
template<class _Dom1, class _Dom2> \ template<class _Dom1, class _Dom2> \
inline _Expr<_BinClos<__##_Fun, _Expr, _Expr, _Dom1, _Dom2>, \ inline _Expr<_BinClos<_UFun, _Expr, _Expr, _Dom1, _Dom2>, \
typename _Dom1::value_type> \ typename _Dom1::value_type> \
_Fun(const _Expr<_Dom1, typename _Dom1::value_type>& __e1, \ _Fun(const _Expr<_Dom1, typename _Dom1::value_type>& __e1, \
const _Expr<_Dom2, typename _Dom2::value_type>& __e2) \ const _Expr<_Dom2, typename _Dom2::value_type>& __e2) \
{ \ { \
typedef typename _Dom1::value_type _Tp; \ typedef typename _Dom1::value_type _Tp; \
typedef _BinClos<__##_Fun, _Expr, _Expr, _Dom1, _Dom2> _Closure; \ typedef _BinClos<_UFun, _Expr, _Expr, _Dom1, _Dom2> _Closure; \
return _Expr<_Closure, _Tp>(_Closure(__e1(), __e2())); \ return _Expr<_Closure, _Tp>(_Closure(__e1(), __e2())); \
} \ } \
\ \
template<class _Dom> \ template<class _Dom> \
inline _Expr<_BinClos<__##_Fun, _Expr, _ValArray, _Dom, \ inline _Expr<_BinClos<_UFun, _Expr, _ValArray, _Dom, \
typename _Dom::value_type>, \ typename _Dom::value_type>, \
typename _Dom::value_type> \ typename _Dom::value_type> \
_Fun(const _Expr<_Dom, typename _Dom::value_type>& __e, \ _Fun(const _Expr<_Dom, typename _Dom::value_type>& __e, \
const valarray<typename _Dom::value_type>& __v) \ const valarray<typename _Dom::value_type>& __v) \
{ \ { \
typedef typename _Dom::value_type _Tp; \ typedef typename _Dom::value_type _Tp; \
typedef _BinClos<__##_Fun, _Expr, _ValArray, _Dom, _Tp> _Closure; \ typedef _BinClos<_UFun, _Expr, _ValArray, _Dom, _Tp> _Closure; \
return _Expr<_Closure, _Tp>(_Closure(__e(), __v)); \ return _Expr<_Closure, _Tp>(_Closure(__e(), __v)); \
} \ } \
\ \
template<class _Dom> \ template<class _Dom> \
inline _Expr<_BinClos<__##_Fun, _ValArray, _Expr, \ inline _Expr<_BinClos<_UFun, _ValArray, _Expr, \
typename _Dom::value_type, _Dom>, \ typename _Dom::value_type, _Dom>, \
typename _Dom::value_type> \ typename _Dom::value_type> \
_Fun(const valarray<typename _Dom::valarray>& __v, \ _Fun(const valarray<typename _Dom::valarray>& __v, \
const _Expr<_Dom, typename _Dom::value_type>& __e) \ const _Expr<_Dom, typename _Dom::value_type>& __e) \
{ \ { \
typedef typename _Dom::value_type _Tp; \ typedef typename _Dom::value_type _Tp; \
typedef _BinClos<__##_Fun, _ValArray, _Expr, _Tp, _Dom> _Closure; \ typedef _BinClos<_UFun, _ValArray, _Expr, _Tp, _Dom> _Closure; \
return _Expr<_Closure, _Tp>(_Closure(__v, __e())); \ return _Expr<_Closure, _Tp>(_Closure(__v, __e())); \
} \ } \
\ \
template<class _Dom> \ template<class _Dom> \
inline _Expr<_BinClos<__##_Fun, _Expr, _Constant, _Dom, \ inline _Expr<_BinClos<_UFun, _Expr, _Constant, _Dom, \
typename _Dom::value_type>, \ typename _Dom::value_type>, \
typename _Dom::value_type> \ typename _Dom::value_type> \
_Fun(const _Expr<_Dom, typename _Dom::value_type>& __e, \ _Fun(const _Expr<_Dom, typename _Dom::value_type>& __e, \
const typename _Dom::value_type& __t) \ const typename _Dom::value_type& __t) \
{ \ { \
typedef typename _Dom::value_type _Tp; \ typedef typename _Dom::value_type _Tp; \
typedef _BinClos<__##_Fun, _Expr, _Constant, _Dom, _Tp> _Closure;\ typedef _BinClos<_UFun, _Expr, _Constant, _Dom, _Tp> _Closure; \
return _Expr<_Closure, _Tp>(_Closure(__e(), __t)); \ return _Expr<_Closure, _Tp>(_Closure(__e(), __t)); \
} \ } \
\ \
template<class _Dom> \ template<class _Dom> \
inline _Expr<_BinClos<__##_Fun, _Constant, _Expr, \ inline _Expr<_BinClos<_UFun, _Constant, _Expr, \
typename _Dom::value_type, _Dom>, \ typename _Dom::value_type, _Dom>, \
typename _Dom::value_type> \ typename _Dom::value_type> \
_Fun(const typename _Dom::value_type& __t, \ _Fun(const typename _Dom::value_type& __t, \
const _Expr<_Dom, typename _Dom::value_type>& __e) \ const _Expr<_Dom, typename _Dom::value_type>& __e) \
{ \ { \
typedef typename _Dom::value_type _Tp; \ typedef typename _Dom::value_type _Tp; \
typedef _BinClos<__##_Fun, _Constant, _Expr, _Tp, _Dom> _Closure; \ typedef _BinClos<_UFun, _Constant, _Expr, _Tp, _Dom> _Closure; \
return _Expr<_Closure, _Tp>(_Closure(__t, __e())); \ return _Expr<_Closure, _Tp>(_Closure(__t, __e())); \
} \ } \
\ \
template<typename _Tp> \ template<typename _Tp> \
inline _Expr<_BinClos<__##_Fun, _ValArray, _ValArray, _Tp, _Tp>, _Tp> \ inline _Expr<_BinClos<_UFun, _ValArray, _ValArray, _Tp, _Tp>, _Tp> \
_Fun(const valarray<_Tp>& __v, const valarray<_Tp>& __w) \ _Fun(const valarray<_Tp>& __v, const valarray<_Tp>& __w) \
{ \ { \
typedef _BinClos<__##_Fun, _ValArray, _ValArray, _Tp, _Tp> _Closure; \ typedef _BinClos<_UFun, _ValArray, _ValArray, _Tp, _Tp> _Closure;\
return _Expr<_Closure, _Tp>(_Closure(__v, __w)); \ return _Expr<_Closure, _Tp>(_Closure(__v, __w)); \
} \ } \
\ \
template<typename _Tp> \ template<typename _Tp> \
inline _Expr<_BinClos<__##_Fun, _ValArray, _Constant, _Tp, _Tp>, _Tp> \ inline _Expr<_BinClos<_UFun, _ValArray, _Constant, _Tp, _Tp>, _Tp> \
_Fun(const valarray<_Tp>& __v, const _Tp& __t) \ _Fun(const valarray<_Tp>& __v, const _Tp& __t) \
{ \ { \
typedef _BinClos<__##_Fun, _ValArray, _Constant, _Tp, _Tp> _Closure; \ typedef _BinClos<_UFun, _ValArray, _Constant, _Tp, _Tp> _Closure;\
return _Expr<_Closure, _Tp>(_Closure(__v, __t)); \ return _Expr<_Closure, _Tp>(_Closure(__v, __t)); \
} \ } \
\ \
template<typename _Tp> \ template<typename _Tp> \
inline _Expr<_BinClos<__##_Fun, _Constant, _ValArray, _Tp, _Tp>, _Tp> \ inline _Expr<_BinClos<_UFun, _Constant, _ValArray, _Tp, _Tp>, _Tp> \
_Fun(const _Tp& __t, const valarray<_Tp>& __v) \ _Fun(const _Tp& __t, const valarray<_Tp>& __v) \
{ \ { \
typedef _BinClos<__##_Fun, _Constant, _ValArray, _Tp, _Tp> _Closure; \ typedef _BinClos<_UFun, _Constant, _ValArray, _Tp, _Tp> _Closure;\
return _Expr<_Closure, _Tp>(_Closure(__t, __v)); \ return _Expr<_Closure, _Tp>(_Closure(__t, __v)); \
} }
_DEFINE_EXPR_BINARY_FUNCTION(atan2) _DEFINE_EXPR_BINARY_FUNCTION(atan2, _Atan2)
_DEFINE_EXPR_BINARY_FUNCTION(pow) _DEFINE_EXPR_BINARY_FUNCTION(pow, _Pow)
#undef _DEFINE_EXPR_BINARY_FUNCTION #undef _DEFINE_EXPR_BINARY_FUNCTION
......
libstdc++-v3/include/bits/valarray_before.h
// The template and inlines for the -*- C++ -*- internal _Meta class. // The template and inlines for the -*- C++ -*- internal _Meta class.
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
// 2006, 2009 Free Software Foundation, Inc. // 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
...@@ -59,98 +59,98 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -59,98 +59,98 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// 2) efficiency -- object functions can be easily inlined // 2) efficiency -- object functions can be easily inlined
// 3) be Koenig-lookup-friendly // 3) be Koenig-lookup-friendly
struct __abs struct _Abs
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return abs(__t); } { return abs(__t); }
}; };
struct __cos struct _Cos
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return cos(__t); } { return cos(__t); }
}; };
struct __acos struct _Acos
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return acos(__t); } { return acos(__t); }
}; };
struct __cosh struct _Cosh
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return cosh(__t); } { return cosh(__t); }
}; };
struct __sin struct _Sin
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return sin(__t); } { return sin(__t); }
}; };
struct __asin struct _Asin
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return asin(__t); } { return asin(__t); }
}; };
struct __sinh struct _Sinh
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return sinh(__t); } { return sinh(__t); }
}; };
struct __tan struct _Tan
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return tan(__t); } { return tan(__t); }
}; };
struct __atan struct _Atan
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return atan(__t); } { return atan(__t); }
}; };
struct __tanh struct _Tanh
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return tanh(__t); } { return tanh(__t); }
}; };
struct __exp struct _Exp
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return exp(__t); } { return exp(__t); }
}; };
struct __log struct _Log
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return log(__t); } { return log(__t); }
}; };
struct __log10 struct _Log10
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
{ return log10(__t); } { return log10(__t); }
}; };
struct __sqrt struct _Sqrt
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __t) const _Tp operator()(const _Tp& __t) const
...@@ -269,7 +269,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -269,7 +269,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
struct __logical_not struct __logical_not
{ {
template<typename _Tp> template<typename _Tp>
bool operator()(const _Tp& __x) const { return !__x; } bool operator()(const _Tp& __x) const
{ return !__x; }
}; };
struct __equal_to struct __equal_to
...@@ -315,14 +316,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -315,14 +316,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}; };
// The few binary functions we miss. // The few binary functions we miss.
struct __atan2 struct _Atan2
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __x, const _Tp& __y) const _Tp operator()(const _Tp& __x, const _Tp& __y) const
{ return atan2(__x, __y); } { return atan2(__x, __y); }
}; };
struct __pow struct _Pow
{ {
template<typename _Tp> template<typename _Tp>
_Tp operator()(const _Tp& __x, const _Tp& __y) const _Tp operator()(const _Tp& __x, const _Tp& __y) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment