mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-04-21 15:50:50 +08:00
[multiple changes]
2015-05-22 Ed Schonberg <schonberg@adacore.com> * sem_ch13.adb: Minor reformatting. 2015-05-22 Jose Ruiz <ruiz@adacore.com> * a-reatim.adb: Minor change, fix typo. From-SVN: r223533
This commit is contained in:
parent
90d6b7bc3a
commit
30fc80cfa6
@ -1,3 +1,11 @@
|
||||
2015-05-22 Ed Schonberg <schonberg@adacore.com>
|
||||
|
||||
* sem_ch13.adb: Minor reformatting.
|
||||
|
||||
2015-05-22 Jose Ruiz <ruiz@adacore.com>
|
||||
|
||||
* a-reatim.adb: Minor change, fix typo.
|
||||
|
||||
2015-05-22 Robert Dewar <dewar@adacore.com>
|
||||
|
||||
* sem_util.ads: Minor addition of ??? comment.
|
||||
|
@ -330,7 +330,7 @@ package body Ada.Real_Time is
|
||||
Out_Of_Range;
|
||||
end if;
|
||||
|
||||
-- Same for negative values of seconds, fundge up and check low bound
|
||||
-- Same for negative values of seconds, fudge up and check low bound
|
||||
|
||||
else
|
||||
Fudged_Result := Duration (Result_SC + Fudge) + TS_Fraction;
|
||||
|
@ -3893,8 +3893,8 @@ package body Sem_Ch13 is
|
||||
("indexing function must have at least two parameters");
|
||||
return;
|
||||
|
||||
-- For a derived type, check that no indexing aspect is
|
||||
-- specified for the type if it is also inherited
|
||||
-- For a derived type, check that no indexing aspect is specified
|
||||
-- for the type if it is also inherited
|
||||
|
||||
elsif Is_Derived_Type (Ent) then
|
||||
declare
|
||||
@ -3904,8 +3904,7 @@ package body Sem_Ch13 is
|
||||
if Attr = Name_Constant_Indexing then
|
||||
Inherited :=
|
||||
Find_Aspect (Etype (Ent), Aspect_Constant_Indexing);
|
||||
|
||||
elsif Attr = Name_Variable_Indexing then
|
||||
else pragma Assert (Attr = Name_Variable_Indexing);
|
||||
Inherited :=
|
||||
Find_Aspect (Etype (Ent), Aspect_Variable_Indexing);
|
||||
end if;
|
||||
@ -3914,15 +3913,15 @@ package body Sem_Ch13 is
|
||||
if Debug_Flag_Dot_XX then
|
||||
null;
|
||||
|
||||
-- Indicate the operation that must be overridden,
|
||||
-- rather than redefining the indexing aspect
|
||||
-- Indicate the operation that must be overridden, rather
|
||||
-- than redefining the indexing aspect
|
||||
|
||||
else
|
||||
Illegal_Indexing
|
||||
("indexing function already inherited "
|
||||
& "from parent type");
|
||||
Error_Msg_NE
|
||||
("!override& instead",
|
||||
("!override & instead",
|
||||
N, Entity (Expression (Inherited)));
|
||||
return;
|
||||
end if;
|
||||
|
Loading…
x
Reference in New Issue
Block a user