From 9e169c4bf36a38689550c059570c57efbf00a6fb Mon Sep 17 00:00:00 2001 From: hjl Date: Thu, 1 Jul 2010 22:22:57 +0000 Subject: Merged trunk at revision 161680 into branch. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/vect256@161681 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/prj-part.adb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gcc/ada/prj-part.adb') diff --git a/gcc/ada/prj-part.adb b/gcc/ada/prj-part.adb index c733f38365c..b8abe571bc4 100644 --- a/gcc/ada/prj-part.adb +++ b/gcc/ada/prj-part.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2001-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 2001-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- -- @@ -36,12 +36,11 @@ with Sinput.P; use Sinput.P; with Snames; with Table; -with Ada.Characters.Handling; use Ada.Characters.Handling; -with Ada.Exceptions; use Ada.Exceptions; +with Ada.Characters.Handling; use Ada.Characters.Handling; +with Ada.Exceptions; use Ada.Exceptions; with GNAT.Directory_Operations; use GNAT.Directory_Operations; - -with System.HTable; use System.HTable; +with GNAT.HTable; use GNAT.HTable; package body Prj.Part is @@ -98,7 +97,7 @@ package body Prj.Part is -- limited imported projects when there is a circularity with at least -- one limited imported project file. - package Virtual_Hash is new System.HTable.Simple_HTable + package Virtual_Hash is new GNAT.HTable.Simple_HTable (Header_Num => Header_Num, Element => Project_Node_Id, No_Element => Empty_Node, @@ -108,7 +107,7 @@ package body Prj.Part is -- Hash table to store the node id of the project for which a virtual -- extending project need to be created. - package Processed_Hash is new System.HTable.Simple_HTable + package Processed_Hash is new GNAT.HTable.Simple_HTable (Header_Num => Header_Num, Element => Boolean, No_Element => False, @@ -119,7 +118,7 @@ package body Prj.Part is -- need to have a virtual extending project, to avoid processing the same -- project twice. - package Projects_Paths is new System.HTable.Simple_HTable + package Projects_Paths is new GNAT.HTable.Simple_HTable (Header_Num => Header_Num, Element => Path_Name_Type, No_Element => No_Path, -- cgit v1.2.1