OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make.adb (Insert_Project_Sources): Make sure the Q is always initialized. 

2005-03-17  Vincent Celier  <celier@adacore.com>

	* make.adb (Insert_Project_Sources): Make sure the Q is always
	initialized.

	* prj-nmsc.adb (Check_Ada_Naming_Scheme_Validity): Check Naming against
	the default for the tree, not the global default naming.

	* prj-proc.adb (Recursive_Process): No need to put the default naming
	in the project data, it's already there.

From-SVN: r96669
This commit is contained in:
Vincent Celier 2005-03-18 12:49:51 +01:00 committed by Arnaud Charlet
parent a77842bdf9
commit e5c14bd896
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ada/make.adb
View File

@ -6127,6 +6127,13 @@ package body Make is
Osint.Add_File (Get_Name_String (Sfile));
Put_In_Q := True;
-- As we may look into the Q later, ensure the Q has been
-- initialized to avoid errors.
if First_Q_Initialization then
Init_Q;
end if;
end if;
end loop;
end Insert_Project_Sources;

4
gcc/ada/prj-nmsc.adb
View File

@ -606,9 +606,9 @@ package body Prj.Nmsc is
Naming : Naming_Data)
is
begin
-- Only check if we are not using the standard naming scheme
-- Only check if we are not using the Default naming scheme
if Naming /= Standard_Naming_Data then
if Naming /= In_Tree.Private_Part.Default_Naming then
declare
Dot_Replacement : constant String :=
Get_Name_String

1
gcc/ada/prj-proc.adb
View File

@ -2202,7 +2202,6 @@ package body Prj.Proc is
Processed_Data.Directory := Name_Find;
Processed_Data.Extended_By := Extended_By;
Processed_Data.Naming := Standard_Naming_Data;
Add_Attributes
(Project, In_Tree, Processed_Data.Decl, Attribute_First);