aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/prj.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2009-07-28 11:25:52 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2009-07-28 11:25:52 +0200
commitf7e71125e21dc6589eb2d76ab97cef6bbdcc9f5b (patch)
tree409d0b1b799c65c6daebf6bc8a4193dc7ff5485e /gcc/ada/prj.adb
parent55603e5ee2c71c189a5677071f967f50d6f2e2c8 (diff)
downloadgcc-f7e71125e21dc6589eb2d76ab97cef6bbdcc9f5b.zip
gcc-f7e71125e21dc6589eb2d76ab97cef6bbdcc9f5b.tar.gz
gcc-f7e71125e21dc6589eb2d76ab97cef6bbdcc9f5b.tar.bz2
[multiple changes]
2009-07-28 Emmanuel Briot <briot@adacore.com> * prj.adb, prj.ads (Compute_All_Imported_Projects): Make sure the importing project does not end up in the list, in the case of extending projects. * make.adb, makeutl.adb, makeutl.ads (File_Not_A_Source_Of): Moved to makeutl.ads, for better sharing with gprbuild. 2009-07-28 Arnaud Charlet <charlet@adacore.com> * gnat_ugn.texi: Fix typo. 2009-07-28 Ed Schonberg <schonberg@adacore.com> * sem_ch3.adb (Build_Derived_Concurrent_Type): Handle properly a derivation that renames some discriminants and constrain others. * exp_ch9.adb (Build_Protected_Subprogram_Call): If the type of the prefix is a derived untagged type, convert to the root type to conform to the signature of the protected operations. 2009-07-28 Robert Dewar <dewar@adacore.com> * sinfo.ads: Update comments. * exp_attr.adb: Minor reformatting From-SVN: r150152
Diffstat (limited to 'gcc/ada/prj.adb')
-rw-r--r--gcc/ada/prj.adb4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb
index a4b9de1..0f4e050 100644
--- a/gcc/ada/prj.adb
+++ b/gcc/ada/prj.adb
@@ -1069,8 +1069,8 @@ package body Prj is
begin
-- A project is not importing itself
- if Project /= Prj then
- Prj2 := Ultimate_Extending_Project_Of (Prj);
+ Prj2 := Ultimate_Extending_Project_Of (Prj);
+ if Project /= Prj2 then
-- Check that the project is not already in the list. We know the
-- one passed to Recursive_Add have never been visited before, but