Mercurial > hg > CbC > CbC_gcc

comparison 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
comparison
equal deleted inserted replaced
112:ab0bcb71f44d 113:bdf41c9fa0b7
365 { "__alignof__", RID_ALIGNOF, 0 }, 365 { "__alignof__", RID_ALIGNOF, 0 },
366 { "__asm", RID_ASM, 0 }, 366 { "__asm", RID_ASM, 0 },
367 { "__asm__", RID_ASM, 0 }, 367 { "__asm__", RID_ASM, 0 },
368 { "__attribute", RID_ATTRIBUTE, 0 }, 368 { "__attribute", RID_ATTRIBUTE, 0 },
369 { "__attribute__", RID_ATTRIBUTE, 0 }, 369 { "__attribute__", RID_ATTRIBUTE, 0 },
370 <<<<<<< local
371 { "__auto_type", RID_AUTO_TYPE, D_CONLY }, 370 { "__auto_type", RID_AUTO_TYPE, D_CONLY },
372 { "__bases", RID_BASES, D_CXXONLY }, 371 { "__bases", RID_BASES, D_CXXONLY },
373 { "__builtin_addressof", RID_ADDRESSOF, D_CXXONLY }, 372 { "__builtin_addressof", RID_ADDRESSOF, D_CXXONLY },
374 { "__builtin_call_with_static_chain", 373 { "__builtin_call_with_static_chain",
375 RID_BUILTIN_CALL_WITH_STATIC_CHAIN, D_CONLY }, 374 RID_BUILTIN_CALL_WITH_STATIC_CHAIN, D_CONLY },
376 =======
377 #ifndef noCbC 375 #ifndef noCbC
378 /* CbC project */ 376 /* CbC project */
379 { "__code", RID_CbC_CODE, 0 }, 377 { "__code", RID_CbC_CODE, 0 },
380 // { "code", RID_CbC_CODE, 0 },
381 { "__rectype", RID_CbC_REC, 0},
382 { "selftype", RID_CbC_SELFTYPE, 0},
383 #endif 378 #endif
384 >>>>>>> other
385 { "__builtin_choose_expr", RID_CHOOSE_EXPR, D_CONLY }, 379 { "__builtin_choose_expr", RID_CHOOSE_EXPR, D_CONLY },
386 { "__builtin_complex", RID_BUILTIN_COMPLEX, D_CONLY }, 380 { "__builtin_complex", RID_BUILTIN_COMPLEX, D_CONLY },
387 { "__builtin_launder", RID_BUILTIN_LAUNDER, D_CXXONLY }, 381 { "__builtin_launder", RID_BUILTIN_LAUNDER, D_CXXONLY },
388 { "__builtin_shuffle", RID_BUILTIN_SHUFFLE, 0 }, 382 { "__builtin_shuffle", RID_BUILTIN_SHUFFLE, 0 },
389 { "__builtin_offsetof", RID_OFFSETOF, 0 }, 383 { "__builtin_offsetof", RID_OFFSETOF, 0 },