summaryrefslogtreecommitdiff
path: root/gcc/cp/lex.c
diff options
context:
space:
mode:
authormrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>1995-04-09 11:41:24 +0000
committermrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>1995-04-09 11:41:24 +0000
commit3e1ffd94d6108585c6e2671115c0b5cfd82635fd (patch)
treeaffdf28a98304305e737299defa9b9b42cbd8a65 /gcc/cp/lex.c
parentd3287673dd35b8c384ee8ba538124eae83a911bd (diff)
downloadgcc-3e1ffd94d6108585c6e2671115c0b5cfd82635fd.tar.gz
64th Cygnus<->FSF merge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@9341 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/lex.c')
-rw-r--r--gcc/cp/lex.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 6d46976769a..2392599ec8d 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -809,12 +809,16 @@ init_lex ()
{
/* These are new ANSI keywords that may break code. */
UNSET_RESERVED_WORD ("and");
+ UNSET_RESERVED_WORD ("and_eq");
UNSET_RESERVED_WORD ("bitand");
UNSET_RESERVED_WORD ("bitor");
UNSET_RESERVED_WORD ("compl");
UNSET_RESERVED_WORD ("not");
+ UNSET_RESERVED_WORD ("not_eq");
UNSET_RESERVED_WORD ("or");
+ UNSET_RESERVED_WORD ("or_eq");
UNSET_RESERVED_WORD ("xor");
+ UNSET_RESERVED_WORD ("xor_eq");
}
if (! flag_traditional)
UNSET_RESERVED_WORD ("overload");
@@ -1784,7 +1788,10 @@ cons_up_default_function (type, full_name, kind)
return fn;
if (processing_template_defn)
- SET_DECL_IMPLICIT_INSTANTIATION (fn);
+ {
+ SET_DECL_IMPLICIT_INSTANTIATION (fn);
+ repo_template_used (fn);
+ }
if (CLASSTYPE_INTERFACE_KNOWN (type))
{