1
0
Fork 0
This commit is contained in:
Tiger Wang 2021-02-10 16:46:42 +00:00
parent 2f1359a0f9
commit 6aa1d13508
4 changed files with 3 additions and 19 deletions

View File

@ -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

@ -1 +1 @@
Subproject commit e0f46c3c9fbb4213ac7534b2bfe5cfc78e07c1f5
Subproject commit cb1502021a723db7926c0823ac41f2190a2ecc7e

View File

@ -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

View File

@ -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