2011-12-05 Bob Duff <duff@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / g-dynhta.adb

diff --git a/gcc/ada/g-dynhta.adb b/gcc/ada/g-dynhta.adb
index 154d205..f8ac29d 100644 (file)
--- a/gcc/ada/g-dynhta.adb
+++ b/gcc/ada/g-dynhta.adb
@@ -1,42 +1,39 @@
 ------------------------------------------------------------------------------
 --                                                                          --
---                         GNAT RUNTIME COMPONENTS                          --
+--                         GNAT RUN-TIME COMPONENTS                         --
 --                                                                          --
 --                 G N A T . D Y N A M I C _ H T A B L E S                  --
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---           Copyright (C) 2002-2003 Ada Core Technologies, Inc.            --
+--                     Copyright (C) 2002-2010, AdaCore                     --
 --                                                                          --
 -- 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- --
--- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
 -- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
 -- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
--- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
--- for  more details.  You should have  received  a copy of the GNU General --
--- Public License  distributed with GNAT;  see file COPYING.  If not, write --
--- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
--- MA 02111-1307, USA.                                                      --
+-- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
 --                                                                          --
--- As a special exception,  if other files  instantiate  generics from this --
--- unit, or you link  this unit with other files  to produce an executable, --
--- this  unit  does not  by itself cause  the resulting  executable  to  be --
--- covered  by the  GNU  General  Public  License.  This exception does not --
--- however invalidate  any other reasons why  the executable file  might be --
--- covered by the  GNU Public License.                                      --
+-- As a special exception under Section 7 of GPL version 3, you are granted --
+-- additional permissions described in the GCC Runtime Library Exception,   --
+-- version 3.1, as published by the Free Software Foundation.               --
+--                                                                          --
+-- You should have received a copy of the GNU General Public License and    --
+-- a copy of the GCC Runtime Library Exception along with this program;     --
+-- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+-- <http://www.gnu.org/licenses/>.                                          --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
 -- Extensive contributions were provided by Ada Core Technologies Inc.      --
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Ada.Unchecked_Deallocation;
 package body GNAT.Dynamic_HTables is
 
-   --------------------
-   --  Static_HTable --
-   --------------------
+   -------------------
+   -- Static_HTable --
+   -------------------
 
    package body Static_HTable is
 
@@ -179,6 +176,9 @@ package body GNAT.Dynamic_HTables is
       -----------
 
       procedure Reset (T : in out Instance) is
+         procedure Free is
+           new Ada.Unchecked_Deallocation (Instance_Data, Instance);
+
       begin
          if T = null then
             return;
@@ -187,6 +187,8 @@ package body GNAT.Dynamic_HTables is
          for J in T.Table'Range loop
             T.Table (J) := Null_Ptr;
          end loop;
+
+         Free (T);
       end Reset;
 
       ---------
@@ -205,11 +207,12 @@ package body GNAT.Dynamic_HTables is
          Set_Next (E, T.Table (Index));
          T.Table (Index) := E;
       end Set;
+
    end Static_HTable;
 
-   --------------------
-   --  Simple_HTable --
-   --------------------
+   -------------------
+   -- Simple_HTable --
+   -------------------
 
    package body Simple_HTable is
 
@@ -264,7 +267,6 @@ package body GNAT.Dynamic_HTables is
 
       function Get_Next (T : Instance) return Element is
          Tmp : constant Elmt_Ptr := Tab.Get_Next (Tab.Instance (T));
-
       begin
          if Tmp = null then
             return No_Element;
@@ -322,7 +324,6 @@ package body GNAT.Dynamic_HTables is
 
       procedure Set (T : in out Instance; K : Key; E : Element) is
          Tmp : constant Elmt_Ptr := Tab.Get (Tab.Instance (T), K);
-
       begin
          if Tmp = null then
             Tab.Set (Tab.Instance (T), new Element_Wrapper'(K, E, null));
@@ -339,6 +340,7 @@ package body GNAT.Dynamic_HTables is
       begin
          E.Next := Next;
       end Set_Next;
+
    end Simple_HTable;
 
 end GNAT.Dynamic_HTables;