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-cborma.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-cborma.ads')
-rw-r--r-- | gcc/ada/a-cborma.ads | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/gcc/ada/a-cborma.ads b/gcc/ada/a-cborma.ads index c0c160b72f4..e1f9f08f379 100644 --- a/gcc/ada/a-cborma.ads +++ b/gcc/ada/a-cborma.ads @@ -32,6 +32,7 @@ ------------------------------------------------------------------------------ private with Ada.Containers.Red_Black_Trees; + with Ada.Streams; use Ada.Streams; with Ada.Iterator_Interfaces; @@ -48,8 +49,7 @@ package Ada.Containers.Bounded_Ordered_Maps is function Equivalent_Keys (Left, Right : Key_Type) return Boolean; - type Map (Capacity : Count_Type) is tagged private - with + type Map (Capacity : Count_Type) is tagged private with constant_Indexing => Constant_Reference, Variable_Indexing => Reference, Default_Iterator => Iterate, @@ -63,6 +63,7 @@ package Ada.Containers.Bounded_Ordered_Maps is Empty_Map : constant Map; No_Element : constant Cursor; + function Has_Element (Position : Cursor) return Boolean; package Map_Iterator_Interfaces is new @@ -94,7 +95,7 @@ package Ada.Containers.Bounded_Ordered_Maps is (Container : in out Map; Position : Cursor; Process : not null access - procedure (Key : Key_Type; Element : in out Element_Type)); + procedure (Key : Key_Type; Element : in out Element_Type)); procedure Assign (Target : in out Map; Source : Map); @@ -216,20 +217,22 @@ package Ada.Containers.Bounded_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; + function Reference (Container : Map; Key : Key_Type) return Reference_Type; procedure Iterate (Container : Map; Process : not null access procedure (Position : Cursor)); - function Iterate (Container : Map) - return Map_Iterator_Interfaces.Forward_Iterator'class; + 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 |