[PATCH] libstdc++: remove unused variables

[Krystian Kuźniarek via Gcc-patches]

Hi,

A description of the problem/bug and how your patch addresses it:
I've got a small patch for -Wunused-variable in system headers. These
aren't needed (i.e. no preprocessor conditions are there).

Testcases:
N/A, it's only a warning.

ChangeLog:
Sorry, contrib/mklog.py didn't quite work for me.
For some reason after instruction in line 129: "diff = PatchSet(data)" my
"diff" variable is always empty.

Bootstrapping and testing:
Tested that manually by recompling GCC, unfolding all headers with
`#include <stdc++.h>` and compiling what's been included by it.

The patch itself:
diff --git a/libstdc++-v3/include/tr1/ell_integral.tcc
b/libstdc++-v3/include/tr1/ell_integral.tcc
index 3706d8a033a..f3cf12ea2ca 100644
--- a/libstdc++-v3/include/tr1/ell_integral.tcc
+++ b/libstdc++-v3/include/tr1/ell_integral.tcc
@@ -78,9 +78,7 @@ namespace tr1
     __ellint_rf(_Tp __x, _Tp __y, _Tp __z)
     {
       const _Tp __min = std::numeric_limits<_Tp>::min();
-      const _Tp __max = std::numeric_limits<_Tp>::max();
       const _Tp __lolim = _Tp(5) * __min;
-      const _Tp __uplim = __max / _Tp(5);

       if (__x < _Tp(0) || __y < _Tp(0) || __z < _Tp(0))
         std::__throw_domain_error(__N("Argument less than zero "
@@ -319,10 +317,8 @@ namespace tr1
     {
       const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
       const _Tp __errtol = std::pow(__eps / _Tp(8), _Tp(1) / _Tp(6));
-      const _Tp __min = std::numeric_limits<_Tp>::min();
       const _Tp __max = std::numeric_limits<_Tp>::max();
       const _Tp __lolim = _Tp(2) / std::pow(__max, _Tp(2) / _Tp(3));
-      const _Tp __uplim = std::pow(_Tp(0.1L) * __errtol / __min, _Tp(2) /
_Tp(3));

       if (__x < _Tp(0) || __y < _Tp(0))
         std::__throw_domain_error(__N("Argument less than zero "
@@ -498,9 +494,7 @@ namespace tr1
     __ellint_rc(_Tp __x, _Tp __y)
     {
       const _Tp __min = std::numeric_limits<_Tp>::min();
-      const _Tp __max = std::numeric_limits<_Tp>::max();
       const _Tp __lolim = _Tp(5) * __min;
-      const _Tp __uplim = __max / _Tp(5);

       if (__x < _Tp(0) || __y < _Tp(0) || __x + __y < __lolim)
         std::__throw_domain_error(__N("Argument less than zero "
@@ -569,10 +563,7 @@ namespace tr1
     __ellint_rj(_Tp __x, _Tp __y, _Tp __z, _Tp __p)
     {
       const _Tp __min = std::numeric_limits<_Tp>::min();
-      const _Tp __max = std::numeric_limits<_Tp>::max();
       const _Tp __lolim = std::pow(_Tp(5) * __min, _Tp(1)/_Tp(3));
-      const _Tp __uplim = _Tp(0.3L)
-                        * std::pow(_Tp(0.2L) * __max, _Tp(1)/_Tp(3));

       if (__x < _Tp(0) || __y < _Tp(0) || __z < _Tp(0))
         std::__throw_domain_error(__N("Argument less than zero "
@@ -599,8 +590,7 @@ namespace tr1
           const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
           const _Tp __errtol = std::pow(__eps / _Tp(8), _Tp(1) / _Tp(6));

-          _Tp __lambda, __mu;
-          _Tp __xndev, __yndev, __zndev, __pndev;
+          _Tp __mu, __xndev, __yndev, __zndev, __pndev;

           const unsigned int __max_iter = 100;
           for (unsigned int __iter = 0; __iter < __max_iter; ++__iter)


Best regards,
Krystian