apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: apr/include apr_ring.h
Date Wed, 13 Aug 2003 01:32:11 GMT
jwoolley    2003/08/12 18:32:11

  Modified:    include  apr_ring.h
  Log:
  rename "this" to "here" since "this" is a reserved word in c++
  
  Revision  Changes    Path
  1.10      +12 -12    apr/include/apr_ring.h
  
  Index: apr_ring.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_ring.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -d -u -r1.9 -r1.10
  --- apr_ring.h	5 Mar 2003 21:22:26 -0000	1.9
  +++ apr_ring.h	13 Aug 2003 01:32:11 -0000	1.10
  @@ -488,28 +488,28 @@
   	APR_RING_CHECK_ELEM(APR_RING_SENTINEL(hp, elem, link), elem, link, msg)
   #define APR_RING_CHECK_ELEM(ep, elem, link, msg) do {			\
   	struct elem *start = (ep);					\
  -	struct elem *this = start;					\
  +	struct elem *here = start;					\
   	fprintf(stderr, "*** ring check start -- %s\n", msg);		\
   	do {								\
  -	    fprintf(stderr, "\telem %p\n", this);			\
  +	    fprintf(stderr, "\telem %p\n", here);			\
   	    fprintf(stderr, "\telem->next %p\n",			\
  -		    APR_RING_NEXT(this, link));				\
  +		    APR_RING_NEXT(here, link));				\
   	    fprintf(stderr, "\telem->prev %p\n",			\
  -		    APR_RING_PREV(this, link));				\
  +		    APR_RING_PREV(here, link));				\
   	    fprintf(stderr, "\telem->next->prev %p\n",			\
  -		    APR_RING_PREV(APR_RING_NEXT(this, link), link));	\
  +		    APR_RING_PREV(APR_RING_NEXT(here, link), link));	\
   	    fprintf(stderr, "\telem->prev->next %p\n",			\
  -		    APR_RING_NEXT(APR_RING_PREV(this, link), link));	\
  -	    if (APR_RING_PREV(APR_RING_NEXT(this, link), link) != this) { \
  -		fprintf(stderr, "\t*** this->next->prev != this\n");	\
  +		    APR_RING_NEXT(APR_RING_PREV(here, link), link));	\
  +	    if (APR_RING_PREV(APR_RING_NEXT(here, link), link) != here) { \
  +		fprintf(stderr, "\t*** elem->next->prev != elem\n");	\
   		break;							\
   	    }								\
  -	    if (APR_RING_NEXT(APR_RING_PREV(this, link), link) != this) { \
  -		fprintf(stderr, "\t*** this->prev->next != this\n");	\
  +	    if (APR_RING_NEXT(APR_RING_PREV(here, link), link) != here) { \
  +		fprintf(stderr, "\t*** elem->prev->next != elem\n");	\
   		break;							\
   	    }								\
  -	    this = APR_RING_NEXT(this, link);				\
  -	} while (this != start);					\
  +	    here = APR_RING_NEXT(here, link);				\
  +	} while (here != start);					\
   	fprintf(stderr, "*** ring check end\n");			\
       } while (0)
   #else
  
  
  

Mime
View raw message