From 637c0c68fa9d394489f8fb2a72f2f12b9fe9318b Mon Sep 17 00:00:00 2001 From: Adrian Conlon Date: Tue, 12 Dec 2017 23:12:45 +0000 Subject: [PATCH] Correct a couple of merge issues. Signed-off-by: Adrian Conlon --- inc/EightBitCompilerDefinitions.h | 2 +- inc/IntelProcessor.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/EightBitCompilerDefinitions.h b/inc/EightBitCompilerDefinitions.h index 0c4adac..34c46fc 100644 --- a/inc/EightBitCompilerDefinitions.h +++ b/inc/EightBitCompilerDefinitions.h @@ -61,7 +61,7 @@ inline int EightBit::findFirstSet(int value) { # define LIKELY(x) __builtin_expect(!!(x), 1) # define UNLIKELY(x) __builtin_expect(!!(x), 0) -# define EIGHTBIT_PARITY(x) __builtin_parity(x) +# define PARITY(x) __builtin_parity(x) # define UNREACHABLE __builtin_unreachable(); diff --git a/inc/IntelProcessor.h b/inc/IntelProcessor.h index 1054ee0..5b9be6e 100644 --- a/inc/IntelProcessor.h +++ b/inc/IntelProcessor.h @@ -69,7 +69,7 @@ namespace EightBit { } template static void adjustParity(uint8_t& f, uint8_t value) { - clearFlag(f, T::PF, EIGHTBIT_PARITY(value)); + clearFlag(f, T::PF, PARITY(value)); } template static void adjustSZ(uint8_t& f, uint8_t value) {