diff gcc/ada/libgnat/s-dmotpr.ads @ 131:84e7813d76e9

gcc-8.2
author mir3636
date Thu, 25 Oct 2018 07:37:49 +0900
parents 04ced10e8804
children 1830386684a0
line wrap: on
line diff
--- a/gcc/ada/libgnat/s-dmotpr.ads	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/ada/libgnat/s-dmotpr.ads	Thu Oct 25 07:37:49 2018 +0900
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                  S p e c                                 --
 --                                                                          --
---           Copyright (C) 2011-2017, Free Software Foundation, Inc.        --
+--           Copyright (C) 2011-2018, Free Software Foundation, Inc.        --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -29,144 +29,7 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
---  Package that defines some other prefixes for the MKS base unit system.
-
---  These prefixes have been defined in a child package in order to avoid too
---  many constant declarations in System.Dim_Mks.
+with System.Dim.Generic_Mks.Generic_Other_Prefixes;
 
 package System.Dim.Mks.Other_Prefixes is
-
-   --  SI prefixes for Meter
-
-   pragma Warnings (Off);
-   --  Turn off the all the dimension warnings
-
-   ym  : constant Length := 1.0E-24;  -- yocto
-   zm  : constant Length := 1.0E-21;  -- zepto
-   am  : constant Length := 1.0E-18;  -- atto
-   fm  : constant Length := 1.0E-15;  -- femto
-   pm  : constant Length := 1.0E-12;  -- pico
-   nm  : constant Length := 1.0E-09;  -- nano
-   Gm  : constant Length := 1.0E+09;  -- giga
-   Tm  : constant Length := 1.0E+12;  -- tera
-   Pem : constant Length := 1.0E+15;  -- peta
-   Em  : constant Length := 1.0E+18;  -- exa
-   Zem : constant Length := 1.0E+21;  -- zetta
-   Yom : constant Length := 1.0E+24;  -- yotta
-
-   --  SI prefixes for Kilogram
-
-   yg  : constant Mass := 1.0E-27;  -- yocto
-   zg  : constant Mass := 1.0E-24;  -- zepto
-   ag  : constant Mass := 1.0E-21;  -- atto
-   fg  : constant Mass := 1.0E-18;  -- femto
-   pg  : constant Mass := 1.0E-15;  -- pico
-   ng  : constant Mass := 1.0E-12;  -- nano
-   Gg  : constant Mass := 1.0E+06;  -- giga
-   Tg  : constant Mass := 1.0E+09;  -- tera
-   Peg : constant Mass := 1.0E+13;  -- peta
-   Eg  : constant Mass := 1.0E+15;  -- exa
-   Zeg : constant Mass := 1.0E+18;  -- zetta
-   Yog : constant Mass := 1.0E+21;  -- yotta
-
-   --  SI prefixes for Second
-
-   ys  : constant Time := 1.0E-24;  -- yocto
-   zs  : constant Time := 1.0E-21;  -- zepto
-   as  : constant Time := 1.0E-18;  -- atto
-   fs  : constant Time := 1.0E-15;  -- femto
-   ps  : constant Time := 1.0E-12;  -- pico
-   ns  : constant Time := 1.0E-09;  -- nano
-   Gs  : constant Time := 1.0E+09;  -- giga
-   Ts  : constant Time := 1.0E+12;  -- tera
-   Pes : constant Time := 1.0E+15;  -- peta
-   Es  : constant Time := 1.0E+18;  -- exa
-   Zes : constant Time := 1.0E+21;  -- zetta
-   Yos : constant Time := 1.0E+24;  -- yotta
-
-   --  SI prefixes for Ampere
-
-   yA  : constant Electric_Current := 1.0E-24;  -- yocto
-   zA  : constant Electric_Current := 1.0E-21;  -- zepto
-   aA  : constant Electric_Current := 1.0E-18;  -- atto
-   fA  : constant Electric_Current := 1.0E-15;  -- femto
-   nA  : constant Electric_Current := 1.0E-09;  -- nano
-   uA  : constant Electric_Current := 1.0E-06;  -- micro (u)
-   GA  : constant Electric_Current := 1.0E+09;  -- giga
-   TA  : constant Electric_Current := 1.0E+12;  -- tera
-   PeA : constant Electric_Current := 1.0E+15;  -- peta
-   EA  : constant Electric_Current := 1.0E+18;  -- exa
-   ZeA : constant Electric_Current := 1.0E+21;  -- zetta
-   YoA : constant Electric_Current := 1.0E+24;  -- yotta
-
-   --  SI prefixes for Kelvin
-
-   yK  : constant Thermodynamic_Temperature := 1.0E-24;  -- yocto
-   zK  : constant Thermodynamic_Temperature := 1.0E-21;  -- zepto
-   aK  : constant Thermodynamic_Temperature := 1.0E-18;  -- atto
-   fK  : constant Thermodynamic_Temperature := 1.0E-15;  -- femto
-   pK  : constant Thermodynamic_Temperature := 1.0E-12;  -- pico
-   nK  : constant Thermodynamic_Temperature := 1.0E-09;  -- nano
-   uK  : constant Thermodynamic_Temperature := 1.0E-06;  -- micro (u)
-   mK  : constant Thermodynamic_Temperature := 1.0E-03;  -- milli
-   cK  : constant Thermodynamic_Temperature := 1.0E-02;  -- centi
-   dK  : constant Thermodynamic_Temperature := 1.0E-01;  -- deci
-   daK : constant Thermodynamic_Temperature := 1.0E+01;  -- deka
-   hK  : constant Thermodynamic_Temperature := 1.0E+02;  -- hecto
-   kK  : constant Thermodynamic_Temperature := 1.0E+03;  -- kilo
-   MeK : constant Thermodynamic_Temperature := 1.0E+06;  -- mega
-   GK  : constant Thermodynamic_Temperature := 1.0E+09;  -- giga
-   TK  : constant Thermodynamic_Temperature := 1.0E+12;  -- tera
-   PeK : constant Thermodynamic_Temperature := 1.0E+15;  -- peta
-   EK  : constant Thermodynamic_Temperature := 1.0E+18;  -- exa
-   ZeK : constant Thermodynamic_Temperature := 1.0E+21;  -- zetta
-   YoK : constant Thermodynamic_Temperature := 1.0E+24;  -- yotta
-
-   --  SI prefixes for Mole
-
-   ymol  : constant Amount_Of_Substance := 1.0E-24;  -- yocto
-   zmol  : constant Amount_Of_Substance := 1.0E-21;  -- zepto
-   amol  : constant Amount_Of_Substance := 1.0E-18;  -- atto
-   fmol  : constant Amount_Of_Substance := 1.0E-15;  -- femto
-   pmol  : constant Amount_Of_Substance := 1.0E-12;  -- pico
-   nmol  : constant Amount_Of_Substance := 1.0E-09;  -- nano
-   umol  : constant Amount_Of_Substance := 1.0E-06;  -- micro (u)
-   mmol  : constant Amount_Of_Substance := 1.0E-03;  -- milli
-   cmol  : constant Amount_Of_Substance := 1.0E-02;  -- centi
-   dmol  : constant Amount_Of_Substance := 1.0E-01;  -- deci
-   damol : constant Amount_Of_Substance := 1.0E+01;  -- deka
-   hmol  : constant Amount_Of_Substance := 1.0E+02;  -- hecto
-   kmol  : constant Amount_Of_Substance := 1.0E+03;  -- kilo
-   Memol : constant Amount_Of_Substance := 1.0E+06;  -- mega
-   Gmol  : constant Amount_Of_Substance := 1.0E+09;  -- giga
-   Tmol  : constant Amount_Of_Substance := 1.0E+12;  -- tera
-   Pemol : constant Amount_Of_Substance := 1.0E+15;  -- peta
-   Emol  : constant Amount_Of_Substance := 1.0E+18;  -- exa
-   Zemol : constant Amount_Of_Substance := 1.0E+21;  -- zetta
-   Yomol : constant Amount_Of_Substance := 1.0E+24;  -- yotta
-
-   --  SI prefixes for Candela
-
-   ycd  : constant Luminous_Intensity := 1.0E-24;  -- yocto
-   zcd  : constant Luminous_Intensity := 1.0E-21;  -- zepto
-   acd  : constant Luminous_Intensity := 1.0E-18;  -- atto
-   fcd  : constant Luminous_Intensity := 1.0E-15;  -- femto
-   pcd  : constant Luminous_Intensity := 1.0E-12;  -- pico
-   ncd  : constant Luminous_Intensity := 1.0E-09;  -- nano
-   ucd  : constant Luminous_Intensity := 1.0E-06;  -- micro (u)
-   mcd  : constant Luminous_Intensity := 1.0E-03;  -- milli
-   ccd  : constant Luminous_Intensity := 1.0E-02;  -- centi
-   dcd  : constant Luminous_Intensity := 1.0E-01;  -- deci
-   dacd : constant Luminous_Intensity := 1.0E+01;  -- deka
-   hcd  : constant Luminous_Intensity := 1.0E+02;  -- hecto
-   kcd  : constant Luminous_Intensity := 1.0E+03;  -- kilo
-   Mecd : constant Luminous_Intensity := 1.0E+06;  -- mega
-   Gcd  : constant Luminous_Intensity := 1.0E+09;  -- giga
-   Tcd  : constant Luminous_Intensity := 1.0E+12;  -- tera
-   Pecd : constant Luminous_Intensity := 1.0E+15;  -- peta
-   Ecd  : constant Luminous_Intensity := 1.0E+18;  -- exa
-   Zecd : constant Luminous_Intensity := 1.0E+21;  -- zetta
-   Yocd : constant Luminous_Intensity := 1.0E+24;  -- yotta
-
-   pragma Warnings (On);
-end System.Dim.Mks.Other_Prefixes;
+   new System.Dim.Mks.Generic_Other_Prefixes;