summaryrefslogtreecommitdiff
path: root/gcc/cp/decl2.c
diff options
context:
space:
mode:
authorMike Stump <mrs@gcc.gnu.org>1997-05-02 01:42:58 +0000
committerMike Stump <mrs@gcc.gnu.org>1997-05-02 01:42:58 +0000
commiteb4484594fdd910acdc06149f9c112ab728977b4 (patch)
treed15683fdd007eaa7a6e42cb25ad13d7a80886862 /gcc/cp/decl2.c
parentebcf525f58c8bf78b8ee10c7cd4aed0ee26ff604 (diff)
downloadgcc-eb4484594fdd910acdc06149f9c112ab728977b4.tar.gz
91th Cygnus<->FSF quick merge
From-SVN: r14007
Diffstat (limited to 'gcc/cp/decl2.c')
-rw-r--r--gcc/cp/decl2.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 1e8577af6b2..f7e20640694 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -244,6 +244,10 @@ int warn_synth;
into a pointer to (void or function). */
int warn_pmf2ptr = 1;
+/* Nonzero means warn about violation of some Effective C++ style rules. */
+
+int warn_ecpp = 0;
+
/* Nonzero means `$' can be in an identifier.
See cccp.c for reasons why this breaks some obscure ANSI C programs. */
@@ -579,6 +583,8 @@ lang_decode_option (p)
warn_synth = setting;
else if (!strcmp (p, "pmf-conversions"))
warn_pmf2ptr = setting;
+ else if (!strcmp (p, "effc++"))
+ warn_ecpp = setting;
else if (!strcmp (p, "comment"))
; /* cpp handles this one. */
else if (!strcmp (p, "comments"))
@@ -2413,7 +2419,7 @@ finish_prevtable_vardecl (prev, vars)
tree ctype = DECL_CONTEXT (vars);
import_export_template (ctype);
-#ifndef NO_LINKAGE_HEURISTICS
+#ifndef MULTIPLE_SYMBOL_SPACES
if (CLASSTYPE_INTERFACE_UNKNOWN (ctype) && TYPE_VIRTUAL_P (ctype)
&& ! CLASSTYPE_TEMPLATE_INSTANTIATION (ctype))
{