From e8e19f5d418b3f0facf7f078b7a13400a16832c6 Mon Sep 17 00:00:00 2001 From: charlet Date: Tue, 27 May 2008 10:14:01 +0000 Subject: [PATCH] 2008-05-27 Vincent Celier * prj-nmsc.adb: (Check_File): Make sure that a unit that replaces the same unit in a project being extended is properly processed. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@136000 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/prj-nmsc.adb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index bbb0ec8..c69c7b3 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -8593,13 +8593,21 @@ package body Prj.Nmsc is if Unit /= No_Name and then Src_Data.Unit = Unit - and then Src_Data.Kind /= Kind + and then + ((Src_Data.Kind = Spec and then Kind = Impl) + or else + (Src_Data.Kind = Impl and then Kind = Spec)) then Other_Part := Source; elsif (Unit /= No_Name and then Src_Data.Unit = Unit - and then Src_Data.Kind = Kind) + and then + (Src_Data.Kind = Kind + or else + (Src_Data.Kind = Sep and then Kind = Impl) + or else + (Src_Data.Kind = Impl and then Kind = Sep))) or else (Unit = No_Name and then Src_Data.File = File_Name) then -- Duplication of file/unit in same project is only -- 2.7.4