Mercurial > hg > xemacs-beta

comparison src/lisp.h @ 2552:166ed8151e62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-02-03 16:30:33 by james] Don't define this to c_this, and rename variables currently named this. See xemacs-patches message with ID <psbrb1ehjl.fsf@diannao.ittc.ku.edu>.
author james
date Thu, 03 Feb 2005 16:30:38 +0000
parents c4c8a36043be
children e6854ec89f8e
comparison
equal deleted inserted replaced
2551:9f70af3ac939 2552:166ed8151e62
514 declarations in DECLARE_INTCLASS_ARITH_COMPARE(). The bool/int 514 declarations in DECLARE_INTCLASS_ARITH_COMPARE(). The bool/int
515 equivalence also means that we have to forcibly block the combinations 515 equivalence also means that we have to forcibly block the combinations
516 we don't want by creating overloaded versions of them and declaring them 516 we don't want by creating overloaded versions of them and declaring them
517 private. */ 517 private. */
518 518
519 #undef this
520
521 class Bytecount; 519 class Bytecount;
522 class Bytebpos; 520 class Bytebpos;
523 class Bytexpos; 521 class Bytexpos;
524 class Charcount; 522 class Charcount;
525 class Charbpos; 523 class Charbpos;
940 #if 0 /* doesn't work */ 938 #if 0 /* doesn't work */
941 inline Bytecount operator - (const Ibyte *x, const Ibyte *y) \ 939 inline Bytecount operator - (const Ibyte *x, const Ibyte *y) \
942 { return Bytecount (x - y); } 940 { return Bytecount (x - y); }
943 #endif 941 #endif
944 942
945 #define this c_this
946
947 #endif /* __cplusplus */ 943 #endif /* __cplusplus */
948 944
949 /* Counts of elements */ 945 /* Counts of elements */
950 typedef EMACS_INT Elemcount; 946 typedef EMACS_INT Elemcount;
951 /* Hash codes */ 947 /* Hash codes */
3233 copy constructor or assignment operator is not defined. */ 3229 copy constructor or assignment operator is not defined. */
3234 gcpro () : next (0), var (0), nvars (0) { } 3230 gcpro () : next (0), var (0), nvars (0) { }
3235 gcpro (const gcpro& g) : next (g.next), var (g.var), nvars (g.nvars) { } 3231 gcpro (const gcpro& g) : next (g.next), var (g.var), nvars (g.nvars) { }
3236 gcpro& operator= (const gcpro& g) { next = g.next; var = g.var; 3232 gcpro& operator= (const gcpro& g) { next = g.next; var = g.var;
3237 nvars = g.nvars; 3233 nvars = g.nvars;
3238 #undef this
3239 return *this;} 3234 return *this;}
3240 #define this c_this
3241 ~gcpro () { assert (!next); } 3235 ~gcpro () { assert (!next); }
3242 #endif /* defined (__cplusplus) && defined (ERROR_CHECK_GC) */ 3236 #endif /* defined (__cplusplus) && defined (ERROR_CHECK_GC) */
3243 }; 3237 };
3244 3238
3245 /* Normally, you declare variables gcpro1, gcpro2, ... and use the 3239 /* Normally, you declare variables gcpro1, gcpro2, ... and use the