[Teem-commit] teem/src/gage gage.h,1.60,1.61

[<kin...@us...>]

Update of /cvsroot/teem/teem/src/gage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12510

Modified Files:
	gage.h 
Log Message:
added GAGE_QUERY_ZERO, re-ordered item and kind in gageItemSpec

Index: gage.h
===================================================================
RCS file: /cvsroot/teem/teem/src/gage/gage.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** gage.h	19 Feb 2004 03:50:02 -0000	1.60
--- gage.h	26 Feb 2004 06:19:28 -0000	1.61
***************
*** 449,452 ****
--- 449,454 ----
    (p[0] == q[0] && p[1] == q[1] && p[2] == q[2] && p[3] == q[3] \
     && p[4] == q[4] && p[5] == q[5] && p[6] == q[6] && p[7] == q[7])
+ #define GAGE_QUERY_NONZERO(q) \
+   (q[0] | q[1] | q[2] | q[3] | q[4] | q[5] | q[6] | q[7])
  #define GAGE_QUERY_ITEM_TEST(q, i) (q[i/8] & (1 << (i % 8)))
  #define GAGE_QUERY_ITEM_ON(q, i) (q[i/8] |= (1 << (i % 8)))
***************
*** 572,580 ****
  ******** gageItemSpec struct
  **
! ** dumb little way to store an item/kind pair
  */
  typedef struct {
!   int item;                   /* the quantity we care about */
!   gageKind *kind;             /* what kind it comes from */
  } gageItemSpec;
  
--- 574,583 ----
  ******** gageItemSpec struct
  **
! ** dumb little way to store a kind/item pair.  Formerly known
! ** as a gageQuerySpec.  
  */
  typedef struct {
!   gageKind *kind;             /* the kind of the volume to measure */
!   int item;                   /* the quantity to measure */
  } gageItemSpec;