Merge pull request ornladios#3681 from ax3l/fix-blosc2-windows-min

Fix: std::min w/ windows.h in C-Blosc2
vicentebolea · Jul 2, 2023 · 12c4319 · 12c4319
2 parents 7bd34be + 6277f97
commit 12c4319
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/source/adios2/operator/compress/CompressBlosc.cpp b/source/adios2/operator/compress/CompressBlosc.cpp
@@ -181,8 +181,8 @@ size_t CompressBlosc::Operate(const char *dataIn, const Dims &blockStart,
         for (; inputOffset < sizeIn; ++chunk)
         {
             size_t inputChunkSize =
-                std::min(sizeIn - inputOffset,
-                         static_cast<size_t>(BLOSC2_MAX_BUFFERSIZE));
+                std::min<size_t>(sizeIn - inputOffset,
+                                 static_cast<size_t>(BLOSC2_MAX_BUFFERSIZE));
             bloscSize_t maxIntputSize =
                 static_cast<bloscSize_t>(inputChunkSize);
 
@@ -375,8 +375,8 @@ size_t CompressBlosc::DecompressChunkedFormat(const char *bufferIn,
             char *out_ptr = dataOut + currentOutputSize;
 
             size_t outputChunkSize =
-                std::min(uncompressedSize - currentOutputSize,
-                         static_cast<size_t>(BLOSC2_MAX_BUFFERSIZE));
+                std::min<size_t>(uncompressedSize - currentOutputSize,
+                                 static_cast<size_t>(BLOSC2_MAX_BUFFERSIZE));
             bloscSize_t max_output_size =
                 static_cast<bloscSize_t>(outputChunkSize);
 

diff --git a/source/adios2/toolkit/format/bp/bpBackCompatOperation/compress/BPBackCompatBlosc.cpp b/source/adios2/toolkit/format/bp/bpBackCompatOperation/compress/BPBackCompatBlosc.cpp
@@ -142,8 +142,8 @@ size_t BPBackCompatBlosc::DecompressChunkedFormat(const void *bufferIn,
             uint8_t *out_ptr = outputBuff + currentOutputSize;
 
             size_t outputChunkSize =
-                std::min(uncompressedSize - currentOutputSize,
-                         static_cast<size_t>(BLOSC2_MAX_BUFFERSIZE));
+                std::min<size_t>(uncompressedSize - currentOutputSize,
+                                 static_cast<size_t>(BLOSC2_MAX_BUFFERSIZE));
             bloscSize_t max_output_size =
                 static_cast<bloscSize_t>(outputChunkSize);