resolve.c (resolve_contained_functions): Call resolve_entries first.

2006-02-19  H.J. Lu  <hongjiu.lu@intel.com>

	* resolve.c (resolve_contained_functions): Call resolve_entries
	first.
	(resolve_types): Remove calls to resolve_entries and
	resolve_contained_functions.
	(gfc_resolve): Call resolve_contained_functions.

From-SVN: r111271

gcc/fortran/ChangeLog

+2006-02-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* resolve.c (resolve_contained_functions): Call resolve_entries
+	first.
+	(resolve_types): Remove calls to resolve_entries and
+	resolve_contained_functions.
+	(gfc_resolve): Call resolve_contained_functions.
+
 2006-02-19  Erik Edelmann  <eedelman@gcc.gnu.org>
 
 	PR fortran/26201

gcc/fortran/resolve.c

@@ -542,6 +542,8 @@ resolve_contained_functions (gfc_namespace * ns)
   gfc_namespace *child;
   gfc_entry_list *el;
 
+  resolve_entries (ns);
+
   resolve_formal_arglists (ns);
 
   for (child = ns->contained; child; child = child->sibling)
@@ -6088,10 +6090,6 @@ resolve_types (gfc_namespace * ns)
 
   gfc_current_ns = ns;
 
-  resolve_entries (ns);
-
-  resolve_contained_functions (ns);
-
   gfc_traverse_ns (ns, resolve_symbol);
 
   resolve_fntype (ns);
@@ -6162,6 +6160,7 @@ gfc_resolve (gfc_namespace * ns)
 
   old_ns = gfc_current_ns;
 
+  resolve_contained_functions (ns);
   resolve_types (ns);
   resolve_codes (ns);