From c9711a5ecad7e0600cd296511d3dd7acac083b91 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 30 Dec 2020 20:53:29 -0500 Subject: [PATCH 1/2] ArmCommon: Add missing header guard Prevents any multiple inclusion errors from occurring. --- Source/Core/Common/ArmCommon.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Common/ArmCommon.h b/Source/Core/Common/ArmCommon.h index a18795110e..2e0b99e54c 100644 --- a/Source/Core/Common/ArmCommon.h +++ b/Source/Core/Common/ArmCommon.h @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#pragma once + #include "Common/CommonTypes.h" enum CCFlags From e45aa019ecac43c57826faf5e3df4c153b445d3c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 30 Dec 2020 20:54:03 -0500 Subject: [PATCH 2/2] ArmCommon: Mark NO_COND as constexpr Allows it to be used in compile-time expressions if ever necessary. --- Source/Core/Common/ArmCommon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/ArmCommon.h b/Source/Core/Common/ArmCommon.h index 2e0b99e54c..978565ec22 100644 --- a/Source/Core/Common/ArmCommon.h +++ b/Source/Core/Common/ArmCommon.h @@ -26,4 +26,4 @@ enum CCFlags CC_HS = CC_CS, // Alias of CC_CS Unsigned higher or same CC_LO = CC_CC, // Alias of CC_CC Unsigned lower }; -const u32 NO_COND = 0xE0000000; +constexpr u32 NO_COND = 0xE0000000;