diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-03 10:19:32 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-03 10:19:32 +0000 |
| commit | 039fcfa6316d4a70d271d974f9ded9c2001a97b8 (patch) | |
| tree | b0a3d19077a30eaebc12a8b662cc50d870dcdb04 /gcc/ada/clean.adb | |
| parent | 3aa582cd74c2d892c68361298d2e6e83b9d1d595 (diff) | |
| download | gcc-039fcfa6316d4a70d271d974f9ded9c2001a97b8.tar.gz | |
2011-08-03 Emmanuel Briot <briot@adacore.com>
* gnatcmd.adb, prj-proc.adb, prj-proc.ads, make.adb, mlib-prj.adb,
prj.adb, prj.ads, makeutl.adb, makeutl.ads, clean.adb, prj-nmsc.adb,
prj-util.adb, prj-util.ads, prj-conf.adb, prj-conf.ads, prj-env.adb,
prj-env.ads (Shared_Project_Tree_Data): new type
An aggregate project and its aggregated trees need to share the common
data structures used for lists of strings, packages,... This makes the
code simpler since otherwise we have to pass the root tree (also used
for the configuration file data) in addition to the current project
tree. This also avoids ambiguities as to which tree should be used.
And finally this saves a bit of memory.
(For_Every_Project_Imported): new parameter Tree.
Since aggregated projects are using a different tree, we need to let
the caller know which tree to use to manipulate the returned project.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177261 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/clean.adb')
| -rw-r--r-- | gcc/ada/clean.adb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/ada/clean.adb b/gcc/ada/clean.adb index 9bbf1159051..82f70816c9e 100644 --- a/gcc/ada/clean.adb +++ b/gcc/ada/clean.adb @@ -1170,7 +1170,7 @@ package body Clean is Executable := Executable_Of (Main_Project, - Project_Tree, + Project_Tree.Shared, Main_Source_File, Current_File_Index); @@ -1425,7 +1425,7 @@ package body Clean is -- Add source directories and object directories to the search paths Add_Source_Directories (Main_Project, Project_Tree); - Add_Object_Directories (Main_Project); + Add_Object_Directories (Main_Project, Project_Tree); end if; Osint.Add_Default_Search_Dirs; @@ -1440,7 +1440,7 @@ package body Clean is Value : String_List_Id := Main_Project.Mains; begin while Value /= Prj.Nil_String loop - Main := Project_Tree.String_Elements.Table (Value); + Main := Project_Tree.Shared.String_Elements.Table (Value); Osint.Add_File (File_Name => Get_Name_String (Main.Value), Index => Main.Index); |