aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-12-02 08:46:02 +0100
committerMartin Ridgers <[email protected]>2021-12-02 11:36:19 +0100
commit4350f171b69c3f590ae23724af1e5ab4e27a0f92 (patch)
treec76e9eb9a1d4c02359e853c5047867d8aa574c0d
parentIf-def wrapped some Windows-only includes (diff)
downloadzen-4350f171b69c3f590ae23724af1e5ab4e27a0f92.tar.xz
zen-4350f171b69c3f590ae23724af1e5ab4e27a0f92.zip
If-def'd a #pragma statement
-rw-r--r--zen/chunk/chunk.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/zen/chunk/chunk.cpp b/zen/chunk/chunk.cpp
index 59ce9baa5..590a55180 100644
--- a/zen/chunk/chunk.cpp
+++ b/zen/chunk/chunk.cpp
@@ -549,7 +549,9 @@ protected:
{
zen::RwLock HashLock;
std::unordered_set<zen::IoHash, zen::IoHash::Hasher> Hashes;
+#if ZEN_PLATFORM_WINDOWS
#pragma warning(suppress : 4324) // Padding due to alignment
+#endif
};
Bucket m_Buckets[256];