--- gcc/cp/gxx.gperf	2018/04/24 18:20:22	1.1.1.1
+++ gcc/cp/gxx.gperf	2018/04/24 18:27:12	1.1.1.2
@@ -9,32 +9,34 @@ __asm, GCC_ASM_KEYWORD, NORID
 __asm__, GCC_ASM_KEYWORD, NORID
 __attribute, ATTRIBUTE, NORID
 __attribute__, ATTRIBUTE, NORID
-__classof, CLASSOF, NORID
-__classof__, CLASSOF, NORID
 __const, TYPE_QUAL, RID_CONST
 __const__, TYPE_QUAL, RID_CONST
 __extension__, EXTENSION, NORID
-__headof, HEADOF, NORID
-__headof__, HEADOF, NORID
 __inline, SCSPEC, RID_INLINE
 __inline__, SCSPEC, RID_INLINE
 __label__, LABEL, NORID
+__signature__, AGGR, RID_SIGNATURE	/* Extension */,
 __signed, TYPESPEC, RID_SIGNED
 __signed__, TYPESPEC, RID_SIGNED
+__sigof__, SIGOF, NORID		/* Extension */,
 __typeof, TYPEOF, NORID
 __typeof__, TYPEOF, NORID
 __volatile, TYPE_QUAL, RID_VOLATILE
 __volatile__, TYPE_QUAL, RID_VOLATILE
 __wchar_t, TYPESPEC, RID_WCHAR  /* Unique to ANSI C++ */,
 asm, ASM_KEYWORD, NORID,
+and, ANDAND, NORID,
+and_eq, ASSIGN, NORID,
 auto, SCSPEC, RID_AUTO,
+bitand, '&', NORID,
+bitor, '|', NORID,
 bool, TYPESPEC, RID_BOOL,
 break, BREAK, NORID,
 case, CASE, NORID,
 catch, CATCH, NORID,
 char, TYPESPEC, RID_CHAR,
 class, AGGR, RID_CLASS,
-classof, CLASSOF, NORID,
+compl, '~', NORID,
 const, TYPE_QUAL, RID_CONST,
 const_cast, CONST_CAST, NORID,
 continue, CONTINUE, NORID,
@@ -45,20 +47,25 @@ double, TYPESPEC, RID_DOUBLE,
 dynamic_cast, DYNAMIC_CAST, NORID,
 else, ELSE, NORID,
 enum, ENUM, NORID,
+explicit, SCSPEC, RID_EXPLICIT,
 extern, SCSPEC, RID_EXTERN,
 false, CXX_FALSE, NORID,
 float, TYPESPEC, RID_FLOAT,
 for, FOR, NORID,
 friend, SCSPEC, RID_FRIEND,
 goto, GOTO, NORID,
-headof, HEADOF, NORID,
 if, IF, NORID,
 inline, SCSPEC, RID_INLINE,
 int, TYPESPEC, RID_INT,
 long, TYPESPEC, RID_LONG,
 mutable, SCSPEC, RID_MUTABLE,
+namespace, NAMESPACE, NORID,
 new, NEW, NORID,
+not, '!', NORID,
+not_eq, EQCOMPARE, NORID,
 operator, OPERATOR, NORID,
+or, OROR, NORID,
+or_eq, ASSIGN, NORID,
 overload, OVERLOAD, NORID,
 private, VISSPEC, RID_PRIVATE,
 protected, VISSPEC, RID_PROTECTED,
@@ -75,17 +82,21 @@ static, SCSPEC, RID_STATIC,
 static_cast, STATIC_CAST, NORID,
 struct, AGGR, RID_RECORD,
 switch, SWITCH, NORID,
+template, TEMPLATE, RID_TEMPLATE,
 this, THIS, NORID,
 throw, THROW, NORID,
-template, TEMPLATE, RID_TEMPLATE,
 true, CXX_TRUE, NORID,
 try, TRY, NORID,
 typedef, SCSPEC, RID_TYPEDEF,
-typeof, TYPEOF, NORID,
+typename, TYPENAME_KEYWORD, NORID,
 typeid, TYPEID, NORID,
+typeof, TYPEOF, NORID,
 union, AGGR, RID_UNION,
 unsigned, TYPESPEC, RID_UNSIGNED,
+using, USING, NORID,
 virtual, SCSPEC, RID_VIRTUAL,
 void, TYPESPEC, RID_VOID,
 volatile, TYPE_QUAL, RID_VOLATILE,
 while, WHILE, NORID,
+xor, '^', NORID,
+xor_eq, ASSIGN, NORID,