cp-tree.h (DECL_NAMESPACE_SCOPE_P): Don't treat template parameters as having namespace scope.

	* cp-tree.h (DECL_NAMESPACE_SCOPE_P): Don't treat template
	parameters as having namespace scope.

From-SVN: r30097

gcc/cp/ChangeLog

+1999-10-20  Mark Mitchell  <mark@codesourcery.com>
+
+	* cp-tree.h (DECL_NAMESPACE_SCOPE_P): Don't treat template
+	parameters as having namespace scope.
+
 1999-10-19  Mark Mitchell  <mark@codesourcery.com>
 
 	* method.c (PARM_CAN_BE_ARRAY_TYPE): Remove.

gcc/cp/cp-tree.h

@@ -1766,9 +1766,9 @@ struct lang_decl
 #define DECL_VIRTUAL_CONTEXT(NODE) DECL_CONTEXT (NODE)
 
 /* 1 iff NODE has namespace scope, including the global namespace.  */
-#define DECL_NAMESPACE_SCOPE_P(NODE) \
-  (DECL_CONTEXT (NODE) == NULL_TREE \
-   || TREE_CODE (DECL_CONTEXT (NODE)) == NAMESPACE_DECL)
+#define DECL_NAMESPACE_SCOPE_P(NODE)				\
+  (!DECL_TEMPLATE_PARM_P (NODE)					\
+   && TREE_CODE (CP_DECL_CONTEXT (NODE)) == NAMESPACE_DECL)
 
 /* 1 iff NODE is a class member.  */
 #define DECL_CLASS_SCOPE_P(NODE) \

gcc/testsuite/g++.old-deja/g++.pt/debug1.C

+// Build don't link:
+// Special g++ Options: -g
+// Origin: Jim Wilson <wilson@cygnus.com>
+
+template<template<class> class _Oper,
+    template<class, class> class _Meta1,
+    template<class, class> class _Meta2,
+    class _Dom1, class _Dom2> class _BinClos;