move definition of pi into SystemOfUnits so it is not defined twice

ChangeLog

 
+2014-08-08 Lynn Garren <garren@fnal.gov> 
+
+  * Units/Units/SystemOfUnits.h, Units/Units/PhysicalConstants.h:
+    move definition of pi into SystemOfUnits so it is not defined twice
+    Note that PhysicalConstants.h includes SystemOfUnits.h.
+
 2014-08-04 Lynn Garren <garren@fnal.gov> 
 
   * Utility/Utility/Utility-config.in: remove unnecessary -lm

Units/ChangeLog

+
+2014-08-08 Lynn Garren <garren@fnal.gov> 
+
+  * Units/SystemOfUnits.h, Units/PhysicalConstants.h:
+    move definition of pi into SystemOfUnits so it is not defined twice
+    Note that PhysicalConstants.h includes SystemOfUnits.h.
+
 ==============================
 23.06.14 Release CLHEP-2.2.0.1
 ==============================

Units/Units/PhysicalConstants.h

@@ -44,14 +44,6 @@
 
 namespace CLHEP {
 
-//
-//
-//
-static const double     pi  = 3.14159265358979323846;
-static const double  twopi  = 2*pi;
-static const double halfpi  = pi/2;
-static const double     pi2 = pi*pi;
-
 //
 // 
 //

Units/Units/SystemOfUnits.h

@@ -48,6 +48,14 @@
 
 namespace CLHEP {
 
+  //
+  //
+  //
+  static const double     pi  = 3.14159265358979323846;
+  static const double  twopi  = 2*pi;
+  static const double halfpi  = pi/2;
+  static const double     pi2 = pi*pi;
+
   // 
   // Length [L]
   //
@@ -107,7 +115,7 @@ namespace CLHEP {
   //
   static const double radian      = 1.;                  
   static const double milliradian = 1.e-3*radian;
-  static const double degree = (3.14159265358979323846/180.0)*radian;
+  static const double degree = (pi/180.0)*radian;
 
   static const double   steradian = 1.;