2009-08-20 Edward Smith-Rowland <3dw4rd@verizon.net>

	* include/tr1/gamma.tcc: Change include guard from _TR1_GAMMA_TCC
	to _GLIBCXX_TR1_GAMMA_TCC to match the rest of the headers in tr1.
	* include/tr1/exp_integral.tcc: Replace _TR1_GAMMA_TCC with
	__numeric_constants<_Tp>::__gamma_e().

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150958 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2ab32e3..ce471fe 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-20  Edward Smith-Rowland  <3dw4rd@verizon.net>
+
+       * include/tr1/gamma.tcc: Change include guard from _TR1_GAMMA_TCC
+       to _GLIBCXX_TR1_GAMMA_TCC to match the rest of the headers in tr1.
+       * include/tr1/exp_integral.tcc: Replace _TR1_GAMMA_TCC with
+       __numeric_constants<_Tp>::__gamma_e().
+
 2009-08-17  Benjamin Kosnik  <bkoz@redhat.com>
 
        * testsuite/30_threads/packaged_task/requirements/typedefs.cc: New.

diff --git a/libstdc++-v3/include/tr1/exp_integral.tcc b/libstdc++-v3/include/tr1/exp_integral.tcc
index 5b3af5d..173cbdf 100644 (file)
--- a/libstdc++-v3/include/tr1/exp_integral.tcc
+++ b/libstdc++-v3/include/tr1/exp_integral.tcc
@@ -165,7 +165,7 @@ namespace tr1
             __del = -__fact / _Tp(__i - __nm1);
           else
             {
-              _Tp __psi = -_TR1_GAMMA_TCC;
+              _Tp __psi = -__numeric_constants<_Tp>::gamma_e();
               for (int __ii = 1; __ii <= __nm1; ++__ii)
                 __psi += _Tp(1) / _Tp(__ii);
               __del = __fact * (__psi - std::log(__x)); 

diff --git a/libstdc++-v3/include/tr1/gamma.tcc b/libstdc++-v3/include/tr1/gamma.tcc
index f456da3..b54e643 100644 (file)
--- a/libstdc++-v3/include/tr1/gamma.tcc
+++ b/libstdc++-v3/include/tr1/gamma.tcc
@@ -44,8 +44,8 @@
 //   (4) Gamma, Exploring Euler's Constant, Julian Havil,
 //       Princeton, 2003.
 
-#ifndef _TR1_GAMMA_TCC
-#define _TR1_GAMMA_TCC 1
+#ifndef _GLIBCXX_TR1_GAMMA_TCC
+#define _GLIBCXX_TR1_GAMMA_TCC 1
 
 #include "special_function_util.h"
 
@@ -467,5 +467,5 @@ namespace tr1
 }
 }
 
-#endif // _TR1_GAMMA_TCC
+#endif // _GLIBCXX_TR1_GAMMA_TCC