diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-29 14:25:19 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-29 14:25:19 +0000 |
| commit | 2bb1c36656bb1bcac3ae654ecbdc54b582ed298a (patch) | |
| tree | 1a7fbadf4793fca844818142d46165e676ff37cc /gcc/ada/a-coorma.ads | |
| parent | 15044392b374476c15645b61ce3802439e82d792 (diff) | |
| download | gcc-2bb1c36656bb1bcac3ae654ecbdc54b582ed298a.tar.gz | |
2011-08-29 Robert Dewar <dewar@adacore.com>
* a-cdlili.ads, a-coinve.ads, a-coorma.adb, a-coorma.ads, s-tassta.adb,
a-cborma.adb, a-cborma.ads, a-cohama.ads, a-coorse.ads, a-cbhama.ads,
a-cborse.ads, a-cobove.adb, a-cobove.ads, a-cbhase.ads: Minor
reformatting.
2011-08-29 Tristan Gingold <gingold@adacore.com>
* exp_ch7.adb, exp_ch7.ads (Build_Exception_Handler): Move its spec to
package spec.
* exp_intr.adb (Expand_Unc_Deallocation): Use Build_Exception_Handler.
* a-except.adb, a-except-2005.adb (Rcheck_22): Do not defer aborts
while raising PE.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178245 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/a-coorma.ads')
| -rw-r--r-- | gcc/ada/a-coorma.ads | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gcc/ada/a-coorma.ads b/gcc/ada/a-coorma.ads index 04fe1cf05c3..1beea7bbff5 100644 --- a/gcc/ada/a-coorma.ads +++ b/gcc/ada/a-coorma.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2004-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 2004-2011, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -33,6 +33,7 @@ private with Ada.Containers.Red_Black_Trees; private with Ada.Finalization; + with Ada.Streams; use Ada.Streams; with Ada.Iterator_Interfaces; @@ -49,8 +50,7 @@ package Ada.Containers.Ordered_Maps is function Equivalent_Keys (Left, Right : Key_Type) return Boolean; - type Map is tagged private - with + type Map is tagged private with constant_Indexing => Constant_Reference, Variable_Indexing => Reference, Default_Iterator => Iterate, @@ -62,6 +62,7 @@ package Ada.Containers.Ordered_Maps is Empty_Map : constant Map; No_Element : constant Cursor; + function Has_Element (Position : Cursor) return Boolean; package Map_Iterator_Interfaces is new @@ -211,8 +212,9 @@ package Ada.Containers.Ordered_Maps is for Reference_Type'Write use Write; function Constant_Reference - (Container : Map; Key : Key_Type) -- SHOULD BE ALIASED - return Constant_Reference_Type; + (Container : Map; + Key : Key_Type) -- SHOULD BE ALIASED??? + return Constant_Reference_Type; function Reference (Container : Map; Key : Key_Type) return Reference_Type; @@ -221,10 +223,13 @@ package Ada.Containers.Ordered_Maps is (Container : Map; Process : not null access procedure (Position : Cursor)); - function Iterate (Container : Map) + function Iterate + (Container : Map) return Map_Iterator_Interfaces.Forward_Iterator'class; - function Iterate (Container : Map; Start : Cursor) + function Iterate + (Container : Map; + Start : Cursor) return Map_Iterator_Interfaces.Reversible_Iterator'class; procedure Reverse_Iterate |