Commit 537405d8 authored by Eisenhauer, Greg's avatar Eisenhauer, Greg Committed by Bolea Sanchez, Vicente Adolfo
Browse files

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

Fix: std::min w/ windows.h in C-Blosc2
parents 06ca9cf2 6277f973

source/adios2/operator/compress/CompressBlosc.cpp

+4 −4
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ size_t CompressBlosc::Operate(const char *dataIn, const Dims &blockStart, 
        for (; inputOffset < sizeIn; ++chunk)

        {

            size_t inputChunkSize =

                std::min(sizeIn - inputOffset,

                std::min<size_t>(sizeIn - inputOffset,

                                 static_cast<size_t>(BLOSC2_MAX_BUFFERSIZE));

            bloscSize_t maxIntputSize =

                static_cast<bloscSize_t>(inputChunkSize);
@@ -375,7 +375,7 @@ size_t CompressBlosc::DecompressChunkedFormat(const char *bufferIn, 
            char *out_ptr = dataOut + currentOutputSize;



            size_t outputChunkSize =

                std::min(uncompressedSize - currentOutputSize,

                std::min<size_t>(uncompressedSize - currentOutputSize,

                                 static_cast<size_t>(BLOSC2_MAX_BUFFERSIZE));

            bloscSize_t max_output_size =

                static_cast<bloscSize_t>(outputChunkSize);

source/adios2/toolkit/format/bp/bpBackCompatOperation/compress/BPBackCompatBlosc.cpp

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ size_t BPBackCompatBlosc::DecompressChunkedFormat(const void *bufferIn, 
            uint8_t *out_ptr = outputBuff + currentOutputSize;



            size_t outputChunkSize =

                std::min(uncompressedSize - currentOutputSize,

                std::min<size_t>(uncompressedSize - currentOutputSize,

                                 static_cast<size_t>(BLOSC2_MAX_BUFFERSIZE));

            bloscSize_t max_output_size =

                static_cast<bloscSize_t>(outputChunkSize);