From 4378d23433bf8b13db7f67d2a8667b03d583698e Mon Sep 17 00:00:00 2001
From: Robert Dewar <dewar@adacore.com>
Date: Wed, 6 Jun 2007 12:17:28 +0200
Subject: [PATCH] a-chahan.ads: Remove obsolescent pragmas
2007-04-20 Robert Dewar <dewar@adacore.com>
* a-chahan.ads: Remove obsolescent pragmas
* a-chlat1.ads: Minor reformatting
From-SVN: r125373
---
gcc/ada/a-chahan.ads | 33 +++++++++++----------------------
gcc/ada/a-chlat1.ads | 1 -
2 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/gcc/ada/a-chahan.ads b/gcc/ada/a-chahan.ads
index ccb5825b9bbe..f2d370f27698 100644
--- a/gcc/ada/a-chahan.ads
+++ b/gcc/ada/a-chahan.ads
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992-2005, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2007, 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 --
@@ -92,48 +92,37 @@ package Ada.Characters.Handling is
------------------------------------------------------
-- Ada 2005 AI 395: these functions are moved to Ada.Characters.Conversions
- -- and are considered obsolete in Ada.Characters.Handling. We deal with
- -- this by using the special Ada_05 form of pragma Obsolescent which is
- -- only active in Ada_05 mode.
+ -- and are considered obsolete in Ada.Characters.Handling. However we do
+ -- not complain about this obsolescence, since in practice it is necessary
+ -- to use these routines when creating code that is intended ro run in
+ -- either Ada 95 or Ada 2005 mode.
function Is_Character (Item : Wide_Character) return Boolean;
- pragma Obsolescent
- ("(Ada 2005) use Ada.Characters.Conversions.Is_Character", Ada_05);
-
- function Is_String (Item : Wide_String) return Boolean;
- pragma Obsolescent
- ("(Ada 2005) use Ada.Characters.Conversions.Is_String", Ada_05);
+ function Is_String (Item : Wide_String) return Boolean;
------------------------------------------------------
-- Conversions between Wide_Character and Character --
------------------------------------------------------
-- Ada 2005 AI 395: these functions are moved to Ada.Characters.Conversions
- -- and are considered obsolete in Ada.Characters.Handling. We deal with
- -- this by using the special Ada_05 form of pragma Obsolescent which is
- -- only active in Ada_05 mode.
+ -- and are considered obsolete in Ada.Characters.Handling. However we do
+ -- not complain about this obsolescence, since in practice it is necessary
+ -- to use these routines when creating code that is intended ro run in
+ -- either Ada 95 or Ada 2005 mode.
function To_Character
(Item : Wide_Character;
Substitute : Character := ' ') return Character;
- pragma Obsolescent
- ("(Ada 2005) use Ada.Characters.Conversions.To_Character", Ada_05);
function To_String
(Item : Wide_String;
Substitute : Character := ' ') return String;
- pragma Obsolescent
- ("(Ada 2005) use Ada.Characters.Conversions.To_String", Ada_05);
function To_Wide_Character
(Item : Character) return Wide_Character;
- pragma Obsolescent
- ("(Ada 2005) use Ada.Characters.Conversions.To_Wide_Character", Ada_05);
function To_Wide_String
- (Item : String)return Wide_String;
- pragma Obsolescent
- ("(Ada 2005) use Ada.Characters.Conversions.To_Wide_String", Ada_05);
+ (Item : String) return Wide_String;
private
pragma Inline (Is_Control);
diff --git a/gcc/ada/a-chlat1.ads b/gcc/ada/a-chlat1.ads
index 634d295b272c..f0a9006bd2c4 100644
--- a/gcc/ada/a-chlat1.ads
+++ b/gcc/ada/a-chlat1.ads
@@ -84,7 +84,6 @@ package Ada.Characters.Latin_1 is
Equals_Sign : constant Character := '='; -- Character'Val(61)
Greater_Than_Sign : constant Character := '>'; -- Character'Val(62)
Question : constant Character := '?'; -- Character'Val(63)
-
Commercial_At : constant Character := '@'; -- Character'Val(64)
-- Letters 'A' through 'Z' are at positions 65 through 90