diff --git a/deps/SZ/CMakeLists.txt b/deps/SZ/CMakeLists.txt index 3aa7955f40c7ba0d2d0a00215eecb7d26a4de2b3..badb218087352c794fec390fe9eaed9951e7d621 100644 --- a/deps/SZ/CMakeLists.txt +++ b/deps/SZ/CMakeLists.txt @@ -18,11 +18,12 @@ AUX_SOURCE_DIRECTORY(zstd/legacy SRC7) AUX_SOURCE_DIRECTORY(zstd/dictBuilder SRC8) - # archive ADD_LIBRARY(SZ STATIC ${SRC1} ${SRC2} ${SRC3} ${SRC4} ${SRC5} ${SRC6} ${SRC7} ${SRC8}) -#SET_TARGET_PROPERTIES(SZ PROPERTIES COMPILE_FLAGS -w) - +# windows ignore warning +IF (TD_WINDOWS) + SET_TARGET_PROPERTIES(SZ PROPERTIES COMPILE_FLAGS -w) +ENDIF () diff --git a/deps/SZ/sz/src/ByteToolkit.c b/deps/SZ/sz/src/ByteToolkit.c index f7d31309a554c701db8643041b0c5643296356a2..70b3a00fa79b12492f00a192a6681358aae5c3a9 100644 --- a/deps/SZ/sz/src/ByteToolkit.c +++ b/deps/SZ/sz/src/ByteToolkit.c @@ -288,9 +288,9 @@ inline size_t bytesToSize(unsigned char* bytes) inline void sizeToBytes(unsigned char* outBytes, size_t size) { if(exe_params->SZ_SIZE_TYPE==4) - intToBytes_bigEndian(outBytes, size);//4 + intToBytes_bigEndian(outBytes, (unsigned int)size);//4 else - longToBytes_bigEndian(outBytes, size);//8 + longToBytes_bigEndian(outBytes, (unsigned long)size);//8 } void convertSZParamsToBytes(sz_params* params, unsigned char* result) diff --git a/deps/SZ/sz/src/CompressElement.c b/deps/SZ/sz/src/CompressElement.c index 2b50f7c79d35eb3bb2552e97cbb113ad03aedcd4..50660989f489710baac310534d49c55bdd221ca1 100644 --- a/deps/SZ/sz/src/CompressElement.c +++ b/deps/SZ/sz/src/CompressElement.c @@ -6,9 +6,10 @@ * (C) 2015 by Mathematics and Computer Science (MCS), Argonne National Laboratory. * See COPYRIGHT in top-level directory. */ - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wchar-subscripts" +#ifndef WINDOWS + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wchar-subscripts" +#endif #include #include @@ -231,4 +232,6 @@ inline void updateLossyCompElement_Float(unsigned char* diffBytes, unsigned char lce->residualMidBits = resiBits; } -#pragma GCC diagnostic pop +#ifndef WINDOWS + #pragma GCC diagnostic pop +#endif \ No newline at end of file diff --git a/deps/SZ/zstd/dictBuilder/divsufsort.c b/deps/SZ/zstd/dictBuilder/divsufsort.c index 60cceb088321ce5b62c297a6e714bafff5ae8e75..f6ffed9dbb0e4edd5c855f3d8a5e49b2861da932 100644 --- a/deps/SZ/zstd/dictBuilder/divsufsort.c +++ b/deps/SZ/zstd/dictBuilder/divsufsort.c @@ -25,16 +25,12 @@ */ /*- Compiler specifics -*/ -#ifdef __clang__ -#pragma clang diagnostic ignored "-Wshorten-64-to-32" -#endif #if defined(_MSC_VER) # pragma warning(disable : 4244) # pragma warning(disable : 4127) /* C4127 : Condition expression is constant */ #endif - /*- Dependencies -*/ #include #include