diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-25 19:29:43 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-25 19:29:43 +0000 |
| commit | 46dfcc3ee85a4a02abce4d45ee619f240c116af6 (patch) | |
| tree | 6c3dc3d53cd17d62447673b81abbcfc69bacd2f3 /gcc/ada/a-cohata.ads | |
| parent | 2a8624373adc103f943e22e781c2d6fadb828eae (diff) | |
| download | gcc-46dfcc3ee85a4a02abce4d45ee619f240c116af6.tar.gz | |
2011-08-25 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 178073 using svnmerge.
2011-08-25 Basile Starynkevitch <basile@starynkevitch.net>
* gcc/melt-runtime.c (melt_linemap_compute_current_location): Use the
linemap_position_for_column function for GCC 4.7 when merging with
GCC trunk rev 178073.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@178087 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/a-cohata.ads')
| -rw-r--r-- | gcc/ada/a-cohata.ads | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gcc/ada/a-cohata.ads b/gcc/ada/a-cohata.ads index d935447b25b..1a77970a0c7 100644 --- a/gcc/ada/a-cohata.ads +++ b/gcc/ada/a-cohata.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. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -31,7 +31,8 @@ -- containers. package Ada.Containers.Hash_Tables is - pragma Pure; -- so this can be imported by Remote_Types packages + pragma Pure; + -- Declare Pure so this can be imported by Remote_Types packages generic type Node_Type (<>) is limited private; @@ -42,13 +43,14 @@ package Ada.Containers.Hash_Tables is type Buckets_Type is array (Hash_Type range <>) of Node_Access; type Buckets_Access is access all Buckets_Type; - for Buckets_Access'Storage_Size use 0; -- so this package can be Pure + for Buckets_Access'Storage_Size use 0; + -- Storage_Size of zero so this package can be Pure type Hash_Table_Type is tagged record Buckets : Buckets_Access; Length : Count_Type := 0; - Busy : Natural := 0; - Lock : Natural := 0; + Busy : Natural := 0; + Lock : Natural := 0; end record; end Generic_Hash_Table_Types; @@ -62,11 +64,11 @@ package Ada.Containers.Hash_Tables is (Capacity : Count_Type; Modulus : Hash_Type) is tagged record - Length : Count_Type := 0; - Busy : Natural := 0; - Lock : Natural := 0; - Free : Count_Type'Base := -1; - Nodes : Nodes_Type (1 .. Capacity); + Length : Count_Type := 0; + Busy : Natural := 0; + Lock : Natural := 0; + Free : Count_Type'Base := -1; + Nodes : Nodes_Type (1 .. Capacity) := (others => <>); Buckets : Buckets_Type (1 .. Modulus) := (others => 0); end record; end Generic_Bounded_Hash_Table_Types; |