diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2018-05-29 09:41:40 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2018-05-29 09:41:40 +0000 |
| commit | ec3b72c55d064424cd9ed3b92b1bd7be5b501ecd (patch) | |
| tree | 773d910dc3aea0a16919169023f39ba0f0d82e2e | |
| parent | 57dfb3eca07e7b55dc89c0e3dddc6015f98b63d8 (diff) | |
| download | gcc-ec3b72c55d064424cd9ed3b92b1bd7be5b501ecd.zip gcc-ec3b72c55d064424cd9ed3b92b1bd7be5b501ecd.tar.gz gcc-ec3b72c55d064424cd9ed3b92b1bd7be5b501ecd.tar.bz2 | |
[Ada] Turn Ada.Calendar.Epoch_Offset into a function
2018-05-29 Arnaud Charlet <charlet@adacore.com>
gcc/ada/
* libgnat/a-calend.ads, libgnat/a-calend.adb (Epoch_Offset): Make it a
function.
From-SVN: r260878
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/libgnat/a-calend.adb | 9 | ||||
| -rw-r--r-- | gcc/ada/libgnat/a-calend.ads | 5 |
3 files changed, 17 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index be6192d..3eb0a41 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2018-05-29 Arnaud Charlet <charlet@adacore.com> + + * libgnat/a-calend.ads, libgnat/a-calend.adb (Epoch_Offset): Make it a + function. + 2018-05-29 Olivier Hainque <hainque@adacore.com> * libgnat/system-vxworks7-ppc-rtp.ads: New file. diff --git a/gcc/ada/libgnat/a-calend.adb b/gcc/ada/libgnat/a-calend.adb index 8299b74..8bf5e7a 100644 --- a/gcc/ada/libgnat/a-calend.adb +++ b/gcc/ada/libgnat/a-calend.adb @@ -500,6 +500,15 @@ is return D; end Day; + ------------------ + -- Epoch_Offset -- + ------------------ + + function Epoch_Offset return Time_Rep is + begin + return (136 * 365 + 44 * 366) * Nanos_In_Day; + end Epoch_Offset; + ------------- -- Is_Leap -- ------------- diff --git a/gcc/ada/libgnat/a-calend.ads b/gcc/ada/libgnat/a-calend.ads index 4371e11..b124380 100644 --- a/gcc/ada/libgnat/a-calend.ads +++ b/gcc/ada/libgnat/a-calend.ads @@ -221,8 +221,9 @@ private -- with overloading ambiguities in the body if we tried to use Time as an -- internal computational type. - Epoch_Offset : constant Time_Rep := (136 * 365 + 44 * 366) * Nanos_In_Day; - -- The difference between 2150-1-1 UTC and 1970-1-1 UTC expressed in + function Epoch_Offset return Time_Rep; + pragma Inline (Epoch_Offset); + -- Return the difference between 2150-1-1 UTC and 1970-1-1 UTC expressed in -- nanoseconds. Note that year 2100 is non-leap. Days_In_Month : constant array (Month_Number) of Day_Number := |