Commit 890975e3 by Hristian Kirtchev Committed by Arnaud Charlet

g-sercom-mingw.adb, [...]: Minor reformatting.

2016-07-04  Hristian Kirtchev  <kirtchev@adacore.com>

	* g-sercom-mingw.adb, sem_ch6.adb: Minor reformatting.

From-SVN: r237971
parent ae4c4d53
2016-07-04 Hristian Kirtchev <kirtchev@adacore.com>
* g-sercom-mingw.adb, sem_ch6.adb: Minor reformatting.
2016-07-04 Olivier Hainque <hainque@adacore.com> 2016-07-04 Olivier Hainque <hainque@adacore.com>
* g-sercom-mingw.adb (Set): Fix port configuration for the * g-sercom-mingw.adb (Set): Fix port configuration for the
......
...@@ -248,27 +248,25 @@ package body GNAT.Serial_Communications is ...@@ -248,27 +248,25 @@ package body GNAT.Serial_Communications is
Raise_Error ("cannot set comm state"); Raise_Error ("cannot set comm state");
end if; end if;
-- Set the timeout status, to honor our spec with respect to -- Set the timeout status, to honor our spec with respect to read
-- read timeouts. Always disconnect write timeouts. -- 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); Com_Time_Out := (others => 0);
elsif Timeout = 0.0 then
-- Non-blocking reads and null timeout - immediate return -- Non-blocking reads and null timeout - immediate return with what we
-- with what we have - set ReadIntervalTimeout to MAXDWORD. -- have - set ReadIntervalTimeout to MAXDWORD.
elsif Timeout = 0.0 then
Com_Time_Out := Com_Time_Out :=
(ReadIntervalTimeout => DWORD'Last, (ReadIntervalTimeout => DWORD'Last,
others => 0); others => 0);
else
-- Non-blocking reads with timeout - set total read timeout -- Non-blocking reads with timeout - set total read timeout accordingly
-- accordingly
else
Com_Time_Out := Com_Time_Out :=
(ReadTotalTimeoutConstant => DWORD (1000 * Timeout), (ReadTotalTimeoutConstant => DWORD (1000 * Timeout),
others => 0); others => 0);
......
...@@ -9078,7 +9078,6 @@ package body Sem_Ch6 is ...@@ -9078,7 +9078,6 @@ package body Sem_Ch6 is
Formal := First_Formal (Prev_E); Formal := First_Formal (Prev_E);
F_Typ := Empty; F_Typ := Empty;
while Present (Formal) loop while Present (Formal) loop
F_Typ := Base_Type (Etype (Formal)); F_Typ := Base_Type (Etype (Formal));
...@@ -9092,7 +9091,7 @@ package body Sem_Ch6 is ...@@ -9092,7 +9091,7 @@ package body Sem_Ch6 is
Next_Formal (Formal); Next_Formal (Formal);
end loop; 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 if No (G_Typ) and then Ekind (Prev_E) = E_Function then
G_Typ := Get_Generic_Parent_Type (Base_Type (Etype (Prev_E))); G_Typ := Get_Generic_Parent_Type (Base_Type (Etype (Prev_E)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment