From ab159c638c42760e8c5fc0e8225f92860ecbae0f Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sat, 20 Oct 2018 12:18:16 +0000
Subject: [PATCH] * Move consts to stdconv

git-svn-id: trunk@39994 -
---
 packages/rtl-objpas/src/inc/stdconvs.pp | 33 +++++++++++++++++++++++++
 rtl/objpas/math.pp                      | 33 -------------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/packages/rtl-objpas/src/inc/stdconvs.pp b/packages/rtl-objpas/src/inc/stdconvs.pp
index 14477b5a39..83bc410df4 100644
--- a/packages/rtl-objpas/src/inc/stdconvs.pp
+++ b/packages/rtl-objpas/src/inc/stdconvs.pp
@@ -25,6 +25,39 @@ interface
 {$ifndef FPUNONE}
 Uses convutils;
 
+const
+  // Powers of 10
+  siYocto = 1E-24;
+  siZepto = 1E-21;
+  siAtto  = 1E-18;
+  siFemto = 1E-15;
+  siPico  = 1E-12;
+  siNano  = 1E-9;
+  siMicro = 1E-6;
+  siMilli = 1E-3;
+  siCenti = 1E-2;
+  siDeci  = 1E-1;
+  
+  siDeca  = 10;
+  siHecto = siDeca*10;
+  siKilo  = siHecto*10; 
+  siMega  = siKilo*1000; 
+  siGiga  = siMega*1000; 
+  siTera  = Int64(siGiga*1000); 
+  siPeta  = Int64(siTera*1000); 
+  siExa   = Int64(siPeta*1000);
+  siZetta = 1E21;  
+  siYotta = 1E24;
+  
+  // Powers of 2
+  iecKibi = 1024;                 // 10
+  iecMebi = iecKibi*1024;         // 20
+  iecGibi = iecMebi*1024;         // 30 
+  iecTebi = Int64(iecGibi*1024);  // 40
+  iecPebi = Int64(iecTebi*1024);  // 50
+  iecExbi = Int64(iecPebi*1024);  // 60
+  iecZebi = Double(iecExbi)*1024;  // 70
+  iecYobi = iecZebi*1024;  // 80;
 
 var
 {cbArea family}
diff --git a/rtl/objpas/math.pp b/rtl/objpas/math.pp
index 1da8391eb6..ef0fdd75f2 100644
--- a/rtl/objpas/math.pp
+++ b/rtl/objpas/math.pp
@@ -142,39 +142,6 @@ Const
        LessThanValue = Low(TValueRelationship);
        GreaterThanValue = High(TValueRelationship);
        
-    const
-      // Powers of 10
-      siYocto = 1E-24;
-      siZepto = 1E-21;
-      siAtto  = 1E-18;
-      siFemto = 1E-15;
-      siPico  = 1E-12;
-      siNano  = 1E-9;
-      siMicro = 1E-6;
-      siMilli = 1E-3;
-      siCenti = 1E-2;
-      siDeci  = 1E-1;
-      
-      siDeca  = 10;
-      siHecto = siDeca*10;
-      siKilo  = siHecto*10; 
-      siMega  = siKilo*1000; 
-      siGiga  = siMega*1000; 
-      siTera  = Int64(siGiga*1000); 
-      siPeta  = Int64(siTera*1000); 
-      siExa   = Int64(siPeta*1000);
-      siZetta = 1E21;  
-      siYotta = 1E24;
-      
-      // Powers of 2
-      iecKibi = 1024;                 // 10
-      iecMebi = iecKibi*1024;         // 20
-      iecGibi = iecMebi*1024;         // 30 
-      iecTebi = Int64(iecGibi*1024);  // 40
-      iecPebi = Int64(iecTebi*1024);  // 50
-      iecExbi = Int64(iecPebi*1024);  // 60
-      iecZebi = Double(iecExbi)*1024;  // 70
-      iecYobi = iecZebi*1024;  // 80;
 
        
 {$push}