diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-05-27 10:14:01 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-05-27 10:14:01 +0000 |
| commit | e8e19f5d418b3f0facf7f078b7a13400a16832c6 (patch) | |
| tree | 7b9b7d02f594d4744286459ddecb31eacb7828a5 | |
| parent | b87952044eb0f4fe9d0952ef672b478b8efc3df9 (diff) | |
| download | ppe42-gcc-e8e19f5d418b3f0facf7f078b7a13400a16832c6.tar.gz ppe42-gcc-e8e19f5d418b3f0facf7f078b7a13400a16832c6.zip | |
2008-05-27 Vincent Celier <celier@adacore.com>
* 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
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index bbb0ec8f9ff..c69c7b31605 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 |
