diff options
| author | Vincent Celier <celier@adacore.com> | 2005-03-18 12:49:51 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2005-03-18 12:49:51 +0100 |
| commit | e5c14bd896f5d1d4d4f4fe42e666895cc0716b01 (patch) | |
| tree | 1ed5b3d6514e4e0a6d24da7aa36359ac4f6a8f25 | |
| parent | a77842bdf959270baae1ec9f7d82a3217a083a56 (diff) | |
| download | gcc-e5c14bd896f5d1d4d4f4fe42e666895cc0716b01.zip gcc-e5c14bd896f5d1d4d4f4fe42e666895cc0716b01.tar.gz gcc-e5c14bd896f5d1d4d4f4fe42e666895cc0716b01.tar.bz2 | |
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
| -rw-r--r-- | gcc/ada/make.adb | 7 | ||||
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 4 | ||||
| -rw-r--r-- | gcc/ada/prj-proc.adb | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 71f95c4..9c11556 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -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; diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index c51fbd5..6c814a9 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -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 diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb index c67f2a3..ed3a8b9 100644 --- a/gcc/ada/prj-proc.adb +++ b/gcc/ada/prj-proc.adb @@ -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); |