cp-tree.h (PUSH_GLOBAL, [...]): Delete.

	* cp-tree.h (PUSH_GLOBAL, PUSH_LOCAL, PUSH_USING): Delete.
	* name-lookup.c (create_local_binding): New.
	(update_binding): New.
	(pushdecl_maybe_friend_1): Rename to ...
	(do_pushdecl): ... this.  Reimplement.
	(pushdecl): Adjust.
	(push_overloaded_decl_1, push_overloaded_decl): Delete.

From-SVN: r248387

gcc/cp/ChangeLog

+2017-05-23  Nathan Sidwell  <nathan@acm.org>
+
+	* cp-tree.h (PUSH_GLOBAL, PUSH_LOCAL, PUSH_USING): Delete.
+	* name-lookup.c (create_local_binding): New.
+	(update_binding): New.
+	(pushdecl_maybe_friend_1): Rename to ...
+	(do_pushdecl): ... this.  Reimplement.
+	(pushdecl): Adjust.
+	(push_overloaded_decl_1, push_overloaded_decl): Delete.
+
 2017-05-23  Jason Merrill  <jason@redhat.com>
 
 	PR c++/80396 - built-in for make_integer_sequence.

gcc/cp/cp-tree.h

@@ -5312,14 +5312,6 @@ enum overload_flags { NO_SPECIAL = 0, DTOR_FLAG, TYPENAME_FLAG };
 				   will be identical to
 				   COMPARE_STRICT.  */
 
-/* Used with push_overloaded_decl.  */
-#define PUSH_GLOBAL	     0  /* Push the DECL into namespace scope,
-				   regardless of the current scope.  */
-#define PUSH_LOCAL	     1  /* Push the DECL into the current
-				   scope.  */
-#define PUSH_USING	     2  /* We are pushing this DECL as the
-				   result of a using declaration.  */
-
 /* Used with start function.  */
 #define SF_DEFAULT	     0  /* No flags.  */
 #define SF_PRE_PARSED	     1  /* The function declaration has