diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-25 09:18:43 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-25 09:18:43 +0000 |
| commit | 703cfbf8e933ced3dc6df60732afddc46441db02 (patch) | |
| tree | 9985a90114e8cc5c0d37f35599fac92a57c4698b /gcc/ada/prj-nmsc.adb | |
| parent | 171d6121353dcfe5e22d1fcfd1005f4d84fa6ad3 (diff) | |
| download | gcc-703cfbf8e933ced3dc6df60732afddc46441db02.tar.gz | |
2009-06-25 Vincent Celier <celier@adacore.com>
* s-os_lib.adb (Normalize_Pathname.Get_Directory): If directory
provided, on Windows change all '/' to '\'.
* fmap.ads, fmap.adb (Remove_Forbidden_File_Name): Remove, no longer
used. Minor comment changes
* prj-nmsc.adb: Do not call Fmap.Add_Forbidden_File_Name or
Remove_Forbidden_File_Name.
2009-06-25 Quentin Ochem <ochem@adacore.com>
* prj.ads (Unit_Index): Now general access type.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148936 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-nmsc.adb')
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index 4793ad2678b..3c2a7ebb78c 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -28,7 +28,6 @@ with GNAT.Directory_Operations; use GNAT.Directory_Operations; with GNAT.HTable; with Err_Vars; use Err_Vars; -with Fmap; use Fmap; with Hostparm; with MLib.Tgt; with Opt; use Opt; @@ -4569,9 +4568,9 @@ package body Prj.Nmsc is (UData.File_Names (Impl).Project, Project, Extending) then - -- There is a body for this unit. - -- If there is no spec, we need to check that it - -- is not a subunit. + -- There is a body for this unit. If there is + -- no spec, we need to check that it is not a + -- subunit. if UData.File_Names (Spec) = null then declare @@ -7327,7 +7326,7 @@ package body Prj.Nmsc is then -- If we had another file referencing the same unit (for instance it -- was in an extended project), that source file is in fact invisible - -- from now on, and in particular doesn't belong to the same unit + -- from now on, and in particular doesn't belong to the same unit. if Source.Unit.File_Names (Source.Kind) /= Source then Source.Unit.File_Names (Source.Kind).Unit := No_Unit_Index; @@ -7831,8 +7830,6 @@ package body Prj.Nmsc is Write_Line (Get_Name_String (Excluded.File)); end if; - Add_Forbidden_File_Name (Excluded.File); - else Error_Msg (Project, In_Tree, @@ -8121,13 +8118,6 @@ package body Prj.Nmsc is or else Is_Extending (Project.Extends, UData.File_Names (Unit_Kind).Project) then - if UData.File_Names (Unit_Kind) /= null - and then UData.File_Names (Unit_Kind).Locally_Removed - then - Remove_Forbidden_File_Name - (UData.File_Names (Unit_Kind).File); - end if; - To_Record := True; -- If the same file is already in the list, do not add it again |