renamed conflicting macro/function in bitfield

rfbird · Feb 15, 2018 · 76cbe6d · 76cbe6d
1 parent f7f2384
commit 76cbe6d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/util/bitfield.h b/src/util/bitfield.h
@@ -19,10 +19,10 @@ class BitField
 		/*!---------------------------------------------------------------------
 		 * Set individual bit.
 		----------------------------------------------------------------------*/
-		uint32_t setbit(size_t bit) {
+		uint32_t setibit(size_t bit) {
 			uint32_t tmp = 1<<bit;
 			return bits_ |= tmp;
-		} // setbit
+		} // setibit
 
 		/*!---------------------------------------------------------------------
 		 * Clear bits in mask.
@@ -37,23 +37,23 @@ class BitField
 		uint32_t clearbit(size_t bit) {
 			uint32_t tmp = 1<<bit;
 			return bits_ &= ~tmp;
-		} // setbit
+		} // clearbit
 
 		/*!---------------------------------------------------------------------
 		 * Check whether bit at index is set.
 		----------------------------------------------------------------------*/
 		bool bitset(size_t bit) const {
 			uint32_t tmp = 1<<bit;
 			return tmp & bits_;
-		} // setbit
+		} // bitset
 
 		/*!---------------------------------------------------------------------
 		 * Check whether bits in mask are set.
 		----------------------------------------------------------------------*/
 		bool bitsset(uint32_t mask) const {
 			uint32_t tmp = 1<<mask;
 			return tmp & bits_;
-		} // setbit
+		} // bitset
 
 		/*!---------------------------------------------------------------------
 		 * Check whether bit at index is clear.