Changeset 238 for trunk/archive/pslib/include/psBitMask.h

Timestamp:

Mar 12, 2004, 5:38:26 PM (22 years ago)

Author:

eugene

Message:

moved complex array functions inside psMath.h BinaryOp & UnaryOp
simplified BitMask operation function set

File:

• trunk/archive/pslib/include/psBitMask.h (modified) (3 diffs)

trunk/archive/pslib/include/psBitMask.h

@@ -1 @@
-#if !defined (PS_BIT_MASK_H)
-#define PS_BIT_MASK_H
+# if !defined (PS_BIT_MASK_H)
+# define PS_BIT_MASK_H
 
 /** A bitmask of arbitrary length. */
@@ -20 +20 @@
 /** Set a bit mask */
 psBitMask *
-psSetBitMask(psBitMask *outMask,        //!< Output bit mask or NULL
+psBitMaskSet(psBitMask *outMask,        //!< Output bit mask or NULL
              const psBitMask *myMask,   //!< Input bit mask
              int bit                    //!< Bit to set
@@ -27 +27 @@
 /** Check a bit mask.  Returns true or false */
 int
-psCheckBitMask(const psBitMask *checkMask, //!< Bit mask to check
-               int bit                  //!< Bit to check
+psBitMaskTest(const psBitMask *checkMask, //!< Bit mask to check
+              int bit                   //!< Bit to check
     );
 
-/** OR two bit masks */
+/** apply the given operator to two bit masks */
 psBitMask *
-psOrBitMasks(psBitMask *outMask,        //!< Output bit mask or NULL
-             const psBitMask *restrict inMask1, //!< Input bit mask 1
-             const psBitMask *restrict inMask2 //!< Input bit mask 2
+psBitMaskOp(psBitMask *outMask, //!< Output bit mask or NULL
+            const psBitMask *restrict inMask1,  //!< Input bit mask 1
+            char *operator,             ///< bit mask operator (AND, OR, XOR)
+            const psBitMask *restrict inMask2 //!< Input bit mask 2
     );
 
-/** AND two bit masks */
-psBitMask *
-psAndBitMasks(psBitMask *outMask,       //!< Output bit mask or NULL
-             const psBitMask *restrict inMask1, //!< Input bit mask 1
-             const psBitMask *restrict inMask2 //!< Input bit mask 2
-    );
-
-#endif
+#endif