From 6eaa926a11892f8c650778c66b53c2041f600bdd Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Tue, 15 May 2012 09:40:25 +0000 Subject: [PATCH] s-osprim-mingw.adb, [...]: Minor reformatting 2012-05-15 Robert Dewar * s-osprim-mingw.adb, sem_eval.adb, a-calend-vms.ads: Minor reformatting From-SVN: r187510 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/a-calend-vms.ads | 3 +-- gcc/ada/s-osprim-mingw.adb | 1 - gcc/ada/sem_eval.adb | 9 ++++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0b9c112cb15..2c2baa42469 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2012-05-15 Robert Dewar + + * s-osprim-mingw.adb, sem_eval.adb, a-calend-vms.ads: Minor reformatting + 2012-05-15 Ed Schonberg * sem_eval.adb (Subtypes_Statically_Match): In Ada 2012, static diff --git a/gcc/ada/a-calend-vms.ads b/gcc/ada/a-calend-vms.ads index 134882b0d4f..744011ae008 100644 --- a/gcc/ada/a-calend-vms.ads +++ b/gcc/ada/a-calend-vms.ads @@ -49,9 +49,8 @@ package Ada.Calendar is subtype Month_Number is Integer range 1 .. 12; subtype Day_Number is Integer range 1 .. 31; - -- A Day_Duration value of 86_400.0 designates a new day - subtype Day_Duration is Duration range 0.0 .. 86_400.0; + -- Note that a value of 86_400.0 is the start of the next day function Clock return Time; -- The returned time value is the number of nanoseconds since the start diff --git a/gcc/ada/s-osprim-mingw.adb b/gcc/ada/s-osprim-mingw.adb index a658f71f318..bb1108a765b 100644 --- a/gcc/ada/s-osprim-mingw.adb +++ b/gcc/ada/s-osprim-mingw.adb @@ -236,7 +236,6 @@ package body System.OS_Primitives is function Monotonic_Clock return Duration is Current_Ticks : aliased LARGE_INTEGER; Elap_Secs_Tick : Duration; - begin if QueryPerformanceCounter (Current_Ticks'Access) = Win32.FALSE then return 0.0; diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb index 329a2677ba1..2393f6fac9e 100644 --- a/gcc/ada/sem_eval.adb +++ b/gcc/ada/sem_eval.adb @@ -4669,6 +4669,10 @@ package body Sem_Eval is -- In Ada 2012, subtypes statically match if their static predicates -- match as well. + ---------------------- + -- Predicates_Match -- + ---------------------- + function Predicates_Match return Boolean is Pred1 : Node_Id; Pred2 : Node_Id; @@ -4699,6 +4703,8 @@ package body Sem_Eval is end if; end Predicates_Match; + -- Start of processing for Subtypes_Statically_Match + begin -- A type always statically matches itself @@ -4768,7 +4774,8 @@ package body Sem_Eval is HB2 : constant Node_Id := Type_High_Bound (T2); begin - -- If the bounds are the same tree node, then match + -- If the bounds are the same tree node, then match if and only + -- if any predicates present also match. if LB1 = LB2 and then HB1 = HB2 then return Predicates_Match; -- 2.30.2