Mercurial > hg > CbC > CbC_gcc

diff gcc/c-family/c-common.c @ 113:bdf41c9fa0b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove RECTYPE
author mir3636
date Fri, 17 Nov 2017 06:33:55 +0900
parents ab0bcb71f44d
children d34655255c78
line wrap: on
line diff
--- a/gcc/c-family/c-common.c	Fri Nov 10 19:46:38 2017 +0900
+++ b/gcc/c-family/c-common.c	Fri Nov 17 06:33:55 2017 +0900
@@ -367,21 +367,15 @@
   { "__asm__",		RID_ASM,	0 },
   { "__attribute",	RID_ATTRIBUTE,	0 },
   { "__attribute__",	RID_ATTRIBUTE,	0 },
-<<<<<<< local
   { "__auto_type",	RID_AUTO_TYPE,	D_CONLY },
   { "__bases",          RID_BASES, D_CXXONLY },
   { "__builtin_addressof", RID_ADDRESSOF, D_CXXONLY },
   { "__builtin_call_with_static_chain",
     RID_BUILTIN_CALL_WITH_STATIC_CHAIN, D_CONLY },
-=======
 #ifndef noCbC
   /* CbC project */
   { "__code",         RID_CbC_CODE,   0 },
-  //  { "code",         RID_CbC_CODE,   0 },
-  { "__rectype",       RID_CbC_REC,    0},
-  { "selftype",       RID_CbC_SELFTYPE,    0},
 #endif
->>>>>>> other
   { "__builtin_choose_expr", RID_CHOOSE_EXPR, D_CONLY },
   { "__builtin_complex", RID_BUILTIN_COMPLEX, D_CONLY },
   { "__builtin_launder", RID_BUILTIN_LAUNDER, D_CXXONLY },