2010-10-05 Ed Schonberg <schonberg@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / a-coorma.adb

diff --git a/gcc/ada/a-coorma.adb b/gcc/ada/a-coorma.adb
index f6823d4..ba86520 100644 (file)
--- a/gcc/ada/a-coorma.adb
+++ b/gcc/ada/a-coorma.adb
@@ -6,25 +6,23 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 2004-2006, Free Software Foundation, Inc.         --
+--          Copyright (C) 2004-2010, 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- --
--- 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,  51  Franklin  Street,  Fifth  Floor, --
--- Boston, MA 02110-1301, 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/>.                                          --
 --                                                                          --
 -- This unit was originally developed by Matthew J Heaney.                  --
 ------------------------------------------------------------------------------
@@ -539,7 +537,7 @@ package body Ada.Containers.Ordered_Maps is
       if not Inserted then
          if Container.Tree.Lock > 0 then
             raise Program_Error with
-              "attempt to tamper with cursors (map is locked)";
+              "attempt to tamper with elements (map is locked)";
          end if;
 
          Position.Node.Key := Key;
@@ -547,6 +545,10 @@ package body Ada.Containers.Ordered_Maps is
       end if;
    end Include;
 
+   ------------
+   -- Insert --
+   ------------
+
    procedure Insert
      (Container : in out Map;
       Key       : Key_Type;
@@ -595,6 +597,8 @@ package body Ada.Containers.Ordered_Maps is
       New_Item  : Element_Type)
    is
       Position : Cursor;
+      pragma Unreferenced (Position);
+
       Inserted : Boolean;
 
    begin
@@ -605,10 +609,6 @@ package body Ada.Containers.Ordered_Maps is
       end if;
    end Insert;
 
-   ------------
-   -- Insert --
-   ------------
-
    procedure Insert
      (Container : in out Map;
       Key       : Key_Type;
@@ -1018,7 +1018,7 @@ package body Ada.Containers.Ordered_Maps is
 
       if Container.Tree.Lock > 0 then
          raise Program_Error with
-           "attempt to tamper with cursors (map is locked)";
+           "attempt to tamper with elements (map is locked)";
       end if;
 
       Node.Key := Key;
@@ -1047,7 +1047,7 @@ package body Ada.Containers.Ordered_Maps is
 
       if Container.Tree.Lock > 0 then
          raise Program_Error with
-           "attempt to tamper with cursors (map is locked)";
+           "attempt to tamper with elements (map is locked)";
       end if;
 
       pragma Assert (Vet (Container.Tree, Position.Node),
@@ -1185,6 +1185,7 @@ package body Ada.Containers.Ordered_Maps is
 
          begin
             Process (K, E);
+
          exception
             when others =>
                L := L - 1;