[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.03-68-g662b6df

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 3f41cc38a04fa867e64344c54d9f4f04975104c7
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Mar 5 19:47:34 2013 +0800

    New patch: 06-inline-function.patch

diff --git a/debian/patches/06-inline-function.patch b/debian/patches/06-inline-function.patch
new file mode 100644
index 0000000..37dad87
--- /dev/null
+++ b/debian/patches/06-inline-function.patch
@@ -0,0 +1,69 @@
+--- a/math/mathcore/inc/Math/ChebyshevPol.h
++++ b/math/mathcore/inc/Math/ChebyshevPol.h
+@@ -31,51 +31,51 @@
+             return  (2.0 * x * T<N-1>(x)) - T<N-2>(x);
+          }
+ 
+-         template<> double T<0> (double ) { return 1;}
++         template<> inline double T<0> (double ) { return 1;}
+ 
+-         template<> double T<1> (double x) { return x;}
++         template<> inline double T<1> (double x) { return x;}
+ 
+-         template<> double T<2> (double x) { return 2.0*x*x -1;}
++         template<> inline double T<2> (double x) { return 2.0*x*x -1;}
+ 
+-         template<> double T<3> (double x) { return 4.0*x*x*x -3.0*x;}
++         template<> inline double T<3> (double x) { return 4.0*x*x*x -3.0*x;}
+          
+ 
+          template<int N> double Eval(double x, const double * c) { 
+             return c[N]*T<N>(x) + Eval<N-1>(x,c);
+          }
+       
+-         template<> double Eval<0> (double , const double *c) { return c[0];}
+-         template<> double Eval<1> (double x, const double *c) { return c[1]*x + c[0];}
+-         template<> double Eval<2> (double x, const double *c) { return c[2]*Chebyshev::T<2>(x) + c[1]*x + c[0];}
+-         template<> double Eval<3> (double x, const double *c) { return c[3]*Chebyshev::T<3>(x) + Eval<2>(x,c); }
++         template<> inline double Eval<0> (double , const double *c) { return c[0];}
++         template<> inline double Eval<1> (double x, const double *c) { return c[1]*x + c[0];}
++         template<> inline double Eval<2> (double x, const double *c) { return c[2]*Chebyshev::T<2>(x) + c[1]*x + c[0];}
++         template<> inline double Eval<3> (double x, const double *c) { return c[3]*Chebyshev::T<3>(x) + Eval<2>(x,c); }
+ 
+       } // end namespace Chebyshev
+ 
+ 
+       // implementation of Chebyshev polynomials using all coefficients 
+       // needed for creating TF1 functions
+-      double Chebyshev0(double , double c0) { 
++      inline double Chebyshev0(double , double c0) { 
+          return c0; 
+       }
+-      double Chebyshev1(double x, double c0, double c1) { 
++      inline double Chebyshev1(double x, double c0, double c1) { 
+          return c0 + c1*x; 
+       }
+-      double Chebyshev2(double x, double c0, double c1, double c2) { 
++      inline double Chebyshev2(double x, double c0, double c1, double c2) { 
+          return c0 + c1*x + c2*(2.0*x*x - 1.0); 
+       }
+-      double Chebyshev3(double x, double c0, double c1, double c2, double c3) { 
++      inline double Chebyshev3(double x, double c0, double c1, double c2, double c3) { 
+          return c3*Chebyshev::T<3>(x) + Chebyshev2(x,c0,c1,c2);
+       }
+-      double Chebyshev4(double x, double c0, double c1, double c2, double c3, double c4) { 
++      inline double Chebyshev4(double x, double c0, double c1, double c2, double c3, double c4) { 
+          return c4*Chebyshev::T<4>(x) + Chebyshev3(x,c0,c1,c2,c3);
+       }
+-      double Chebyshev5(double x, double c0, double c1, double c2, double c3, double c4, double c5) { 
++      inline double Chebyshev5(double x, double c0, double c1, double c2, double c3, double c4, double c5) { 
+          return c5*Chebyshev::T<5>(x) + Chebyshev4(x,c0,c1,c2,c3,c4);
+       }
+ 
+ 
+       // implementation of Chebyshev polynomial with run time parameter  
+-      double ChebyshevN(unsigned int n, double x, const double * c) {
++      inline double ChebyshevN(unsigned int n, double x, const double * c) {
+          
+          if (n == 0) return Chebyshev0(x,c[0]);
+          if (n == 1) return Chebyshev1(x,c[0],c[1]);
diff --git a/debian/patches/series b/debian/patches/series
index ea9e0a0..7b5565c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 03-build-libroot-bonjour-package.patch
 04-build-libroot-html-package.patch
 05-rename-package-libroot-proof-proofplayer.patch
+06-inline-function.patch
 15-enable-extra-ldflags.patch
 19-remove-embedded-library-gl2ps.patch
 21-fix-manpage-hyphen.patch

-- 
root-system: CERN's ROOT Data Analysis Framework