Avoid using common words as macro names

Author: tstenner

src/common.h

@@ -30,24 +30,6 @@ extern "C" {
 	"Please do not compile this with a lslboost version older than 1.45 because the library would otherwise not be protocol-compatible with builds using other versions."
 #endif
 
-// size of a cache line
-#if defined(__s390__) || defined(__s390x__)
-#define CACHELINE_BYTES 256
-#elif defined(powerpc) || defined(__powerpc__) || defined(__ppc__)
-#define CACHELINE_BYTES 128
-#else
-#define CACHELINE_BYTES 64
-#endif
-
-// force-inline the given function, if possible
-#if defined(__clang__) || defined(__GNUC__)
-#define FORCEINLINE __attribute__((always_inline))
-#elif defined _MSC_VER
-#define FORCEINLINE __forceinline
-#else
-#define FORCEINLINE inline
-#endif
-
 // compiler hint that the given expression is likely or unlikely
 // (e.g., in conditional statements)
 #if defined(__clang__) || defined(__GNUC__)

src/consumer_queue.h

@@ -9,6 +9,16 @@
 #include <thread>
 
 namespace lsl {
+
+// size of a cache line
+#if defined(__s390__) || defined(__s390x__)
+constexpr int CACHELINE_BYTES = 256;
+#elif defined(powerpc) || defined(__powerpc__) || defined(__ppc__)
+constexpr int CACHELINE_BYTES = 128;
+#else
+constexpr int CACHELINE_BYTES = 64;
+#endif
+
 /**
  * A thread-safe producer/consumer queue of unread samples.
  *
@@ -139,13 +149,13 @@ class consumer_queue {
 	inline static void move_or_drop(sample_p &src, sample_p &dst) { dst = std::move(src); }
 
 	/// helper to add a delta to the given index and wrap correctly
-	FORCEINLINE std::size_t add_wrap(std::size_t x, std::size_t delta) const {
+	inline std::size_t add_wrap(std::size_t x, std::size_t delta) const noexcept {
 		const std::size_t xp = x + delta;
 		return xp >= wrap_at_ ? xp - wrap_at_ : xp;
 	}
 
 	/// helper to increment the given index, wrapping it if necessary
-	inline std::size_t add1_wrap(std::size_t x) const {
+	inline std::size_t add1_wrap(std::size_t x) const noexcept {
 		return ++x == wrap_at_ ? 0 : x;
 	}