From 6aa1d13508fb851e576eac4120b000e06d1a3101 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 10 Feb 2021 16:46:42 +0000 Subject: Clang 7? --- src/Defines.h | 7 ------- .../IncrementalRedstoneSimulator/RedstoneDataHelper.h | 10 ---------- 2 files changed, 17 deletions(-) (limited to 'src') diff --git a/src/Defines.h b/src/Defines.h index 6c6eea323..fb3231ff2 100644 --- a/src/Defines.h +++ b/src/Defines.h @@ -12,16 +12,9 @@ typedef std::vector cSlotNums; -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wmissing-variable-declarations" -#endif /** Constant to calculate ticks from seconds "ticks per second" */ constexpr inline const int TPS = 20; // This is not added to the lua API because it broke the build -#ifdef __clang__ -#pragma clang diagnostic pop -#endif diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneDataHelper.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneDataHelper.h index 2f827206f..dc97a34d4 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneDataHelper.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneDataHelper.h @@ -36,12 +36,6 @@ inline void InvokeForAdjustedRelatives(ForEachSourceCallback & Callback, const V } } -// Warning shouldn't trigger for inline variables, this is fixed in clang 7 -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wmissing-variable-declarations" -#endif - inline constexpr Vector3i OffsetYP{ 0, 1, 0 }; inline constexpr Vector3i OffsetYM{ 0, -1, 0 }; @@ -67,7 +61,3 @@ inline constexpr std::array RelativeLaterals { 0, 0, -1 }, } }; - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif -- cgit v1.2.3