4 files changed, 2 insertions, 18 deletions

diff --git a/.travis.yml b/.travis.yml
index a78ec5656..6c2dfc2e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,10 @@ addons:
 jobs:
   include:
     # ARM workers are the slowest. Having these first in the build matrix makes travis faster overall.
-    - name: "Clang 6.0 - Debug"
+    - name: "Clang 10.0 - Debug"
       arch: arm64
       compiler: clang
+      dist: focal # For Clang 10, bionic is Clang 6 for some reason.
       before_install: &use-cmake
         - export PATH=/snap/bin/:${PATH}
       env: *Debug
diff --git a/lib/libdeflate b/lib/libdeflate
-Subproject e0f46c3c9fbb4213ac7534b2bfe5cfc78e07c1f
+Subproject cb1502021a723db7926c0823ac41f2190a2ecc7
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