From 890975e3443c1977ff636a265d0ad82408e898aa Mon Sep 17 00:00:00 2001 From: Hristian Kirtchev Date: Mon, 4 Jul 2016 10:44:24 +0000 Subject: [PATCH] g-sercom-mingw.adb, [...]: Minor reformatting. 2016-07-04 Hristian Kirtchev * g-sercom-mingw.adb, sem_ch6.adb: Minor reformatting. From-SVN: r237971 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/g-sercom-mingw.adb | 20 +++++++++----------- gcc/ada/sem_ch6.adb | 3 +-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 55e56f78bbc..090654bbd94 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2016-07-04 Hristian Kirtchev + + * g-sercom-mingw.adb, sem_ch6.adb: Minor reformatting. + 2016-07-04 Olivier Hainque * g-sercom-mingw.adb (Set): Fix port configuration for the diff --git a/gcc/ada/g-sercom-mingw.adb b/gcc/ada/g-sercom-mingw.adb index ec3beaa2b03..dabbfcfd405 100644 --- a/gcc/ada/g-sercom-mingw.adb +++ b/gcc/ada/g-sercom-mingw.adb @@ -248,27 +248,25 @@ package body GNAT.Serial_Communications is Raise_Error ("cannot set comm state"); end if; - -- Set the timeout status, to honor our spec with respect to - -- read timeouts. Always disconnect write timeouts. + -- Set the timeout status, to honor our spec with respect to read + -- timeouts. Always disconnect write timeouts. - if Block then - - -- Blocking reads - no timeout at all + -- Blocking reads - no timeout at all + if Block then Com_Time_Out := (others => 0); - elsif Timeout = 0.0 then - -- Non-blocking reads and null timeout - immediate return - -- with what we have - set ReadIntervalTimeout to MAXDWORD. + -- Non-blocking reads and null timeout - immediate return with what we + -- have - set ReadIntervalTimeout to MAXDWORD. + elsif Timeout = 0.0 then Com_Time_Out := (ReadIntervalTimeout => DWORD'Last, others => 0); - else - -- Non-blocking reads with timeout - set total read timeout - -- accordingly + -- Non-blocking reads with timeout - set total read timeout accordingly + else Com_Time_Out := (ReadTotalTimeoutConstant => DWORD (1000 * Timeout), others => 0); diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 0b5f7a3ba29..66434f82454 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -9078,7 +9078,6 @@ package body Sem_Ch6 is Formal := First_Formal (Prev_E); F_Typ := Empty; - while Present (Formal) loop F_Typ := Base_Type (Etype (Formal)); @@ -9092,7 +9091,7 @@ package body Sem_Ch6 is Next_Formal (Formal); end loop; - -- If the function dispatches on result check the result type. + -- If the function dispatches on result check the result type if No (G_Typ) and then Ekind (Prev_E) = E_Function then G_Typ := Get_Generic_Parent_Type (Base_Type (Etype (Prev_E))); -- 2.30.2