[multiple changes]

2010-06-14  Robert Dewar  <dewar@adacore.com>

	* sem_res.adb: Minor reformatting

2010-06-14  Ed Schonberg  <schonberg@adacore.com>

	* sem.adb: New version of unit traversal.

	* sem_elab.adb (Check_Internal_Call): Do not place a call appearing
	within a generic unit in the table of delayed calls.

From-SVN: r160718

gcc/ada/ChangeLog

 2010-06-14  Robert Dewar  <dewar@adacore.com>
 
+	* sem_res.adb: Minor reformatting
+
+2010-06-14  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem.adb: New version of unit traversal.
+
+	* sem_elab.adb (Check_Internal_Call): Do not place a call appearing
+	within a generic unit in the table of delayed calls.
+
+2010-06-14  Robert Dewar  <dewar@adacore.com>
+
 	* gnatcmd.adb, sem_util.adb, exp_ch3.adb: Minor reformatting
 
 2010-06-14  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/sem_elab.adb

@@ -1891,6 +1891,11 @@ package body Sem_Elab is
 
       elsif In_Task_Activation then
          return;
+
+         --  Nothing to do if call is within a generic unit.
+
+      elsif Inside_A_Generic then
+         return;
       end if;
 
       --  Delay this call if we are still delaying calls

gcc/ada/sem_res.adb

@@ -1753,13 +1753,14 @@ package body Sem_Res is
          then
             Error_Msg_NE ("ambiguous call to&", Arg, Name (Arg));
 
+            --  Could use comments on what is going on here ???
+
             Get_First_Interp (Name (Arg), I, It);
             while Present (It.Nam) loop
                Error_Msg_Sloc := Sloc (It.Nam);
 
                if Nkind (Parent (It.Nam)) = N_Full_Type_Declaration then
                   Error_Msg_N ("interpretation (inherited) #!", Arg);
-
                else
                   Error_Msg_N ("interpretation #!", Arg);
                end if;