decl2.c (determine_visibility): Only check data visibility for VAR_DECLS.

	* decl2.c (determine_visibility): Only check data visibility
	for VAR_DECLS.

[[Split portion of a mixed commit.]]

From-SVN: r86983.2

gcc/cp/ChangeLog

+2004-09-02  Paul Brook  <paul@codesourcery.com>
+
+	* decl2.c (determine_visibility): Only check data visibility
+	for VAR_DECLS.
+
 2004-08-31  Mark Mitchell  <mark@codesourcery.com>
 
 	* cp-tree.h (DECL_CONSTRUCTION_VTABLE_P): New macro.
@@ -5,7 +10,7 @@
 	* decl2.c (determine_visibility): Honor 
 	TARGET_CXX_EXPORT_CLASS_DATA.
 
- 	* class.c (key_method): Rename to ...
+	* class.c (key_method): Rename to ...
 	(determine_key_method): ... this.
 	(finish_struct_1): Adjust accordingly.
 	* cp-tree.h (key_method): Declare.

gcc/cp/decl2.c

@@ -1655,7 +1655,8 @@ determine_visibility (tree decl)
      the visibility of their containing class.  */
   if (class_type)
     {
-      if (targetm.cxx.export_class_data ()
+      if (TREE_CODE (decl) == VAR_DECL
+	  && targetm.cxx.export_class_data ()
 	  && (DECL_TINFO_P (decl)
 	      || (DECL_VTABLE_OR_VTT_P (decl)
 		  /* Construction virtual tables are not emitted