diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2021-02-10 17:46:42 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2021-02-11 02:24:50 +0100 |
| commit | 6aa1d13508fb851e576eac4120b000e06d1a3101 (patch) | |
| tree | 5ef260cf99dae038051f7284dcb86a721d5fa408 /src | |
| parent | Fix march=native not being enabled (diff) | |
| download | cuberite-6aa1d13508fb851e576eac4120b000e06d1a3101.tar cuberite-6aa1d13508fb851e576eac4120b000e06d1a3101.tar.gz cuberite-6aa1d13508fb851e576eac4120b000e06d1a3101.tar.bz2 cuberite-6aa1d13508fb851e576eac4120b000e06d1a3101.tar.lz cuberite-6aa1d13508fb851e576eac4120b000e06d1a3101.tar.xz cuberite-6aa1d13508fb851e576eac4120b000e06d1a3101.tar.zst cuberite-6aa1d13508fb851e576eac4120b000e06d1a3101.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Defines.h | 7 | ||||
| -rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator/RedstoneDataHelper.h | 10 |
2 files changed, 0 insertions, 17 deletions
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<int> 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<Vector3i, 4> RelativeLaterals { 0, 0, -1 }, } }; - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif |