Changeset 2247 for trunk/src/gcc/gcc/cp/decl.c

Timestamp:

Jul 15, 2005, 6:49:25 AM (20 years ago)

Author:

bird

Message:

Created a hack for the nsSupportWeakReference / friend problem.

File:

• trunk/src/gcc/gcc/cp/decl.c (modified) (1 diff, 1 prop)

trunk/src/gcc/gcc/cp/decl.c

@@ -13787 +13787 @@
     }
 
+#if 1 /* bird: HACK ALERT! HACK ALERT! */
+  /* Don't replace attributes with nothing. See the nsSupportWeakReference / friend problem.
+     Limit any negative sideeffects this hack may have by only caring for a select number of attributes. */
+  if (   TYPE_ATTRIBUTES (ref)
+      && globalize
+      && (   lookup_attribute ("dllexport", TYPE_ATTRIBUTES (ref))
+          || lookup_attribute ("dllimport", TYPE_ATTRIBUTES (ref))
+          || lookup_attribute ("system", TYPE_ATTRIBUTES (ref))
+          || lookup_attribute ("cdecl", TYPE_ATTRIBUTES (ref))
+          || lookup_attribute ("optlink", TYPE_ATTRIBUTES (ref))
+          || lookup_attribute ("stdcall", TYPE_ATTRIBUTES (ref))))
+    TYPE_ATTRIBUTES (ref) = merge_attributes(TYPE_ATTRIBUTES (ref), attributes);
+  else
+    TYPE_ATTRIBUTES (ref) = attributes;
+#else
   TYPE_ATTRIBUTES (ref) = attributes;
+#endif
 
   POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, ref);