diff options
Diffstat (limited to 'libstdc++-v3/include/std/complex')
| -rw-r--r-- | libstdc++-v3/include/std/complex | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index 4c0d3fbe7db..6d3097e0a1e 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -1,7 +1,7 @@ // The template and inlines for the -*- C++ -*- complex number classes. // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009 +// 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -1572,13 +1572,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { return __complex_proj(__z); } #endif + // DR 1137. template<typename _Tp> - inline std::complex<typename __gnu_cxx::__promote<_Tp>::__type> + inline typename __gnu_cxx::__promote<_Tp>::__type proj(_Tp __x) - { - typedef typename __gnu_cxx::__promote<_Tp>::__type __type; - return std::proj(std::complex<__type>(__x)); - } + { return __x; } + + template<typename _Tp> + inline typename __gnu_cxx::__promote<_Tp>::__type + conj(_Tp __x) + { return __x; } _GLIBCXX_END_NAMESPACE |