From fa11efeba68dd365d147f55bfa858150a834d45c Mon Sep 17 00:00:00 2001 From: Henry Weller <http://cfd.direct> Date: Fri, 1 Jul 2016 10:24:42 +0100 Subject: [PATCH] src/OpenFOAM/primitives/ints: Corrected MIN and MAX for uints Resolves bug-report http://bugs.openfoam.org/view.php?id=2137 --- src/OpenFOAM/primitives/ints/uLabel/uLabel.H | 2 -- src/OpenFOAM/primitives/ints/uLabel/uLabelSpecific.H | 0 src/OpenFOAM/primitives/ints/uint32/uint32.C | 4 ++-- src/OpenFOAM/primitives/ints/uint64/uint64.C | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 src/OpenFOAM/primitives/ints/uLabel/uLabelSpecific.H diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H index 27443560bf6..6bf09a97be6 100644 --- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H +++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H @@ -92,8 +92,6 @@ inline uLabel component(const uLabel l, const direction) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "uLabelSpecific.H" - #undef UINT_ADD_SIZE #undef UINT_ADD_DEF_SIZE #undef UINT_SIZE diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabelSpecific.H b/src/OpenFOAM/primitives/ints/uLabel/uLabelSpecific.H deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.C b/src/OpenFOAM/primitives/ints/uint32/uint32.C index c195b355a45..8f26f6ab72c 100644 --- a/src/OpenFOAM/primitives/ints/uint32/uint32.C +++ b/src/OpenFOAM/primitives/ints/uint32/uint32.C @@ -29,8 +29,8 @@ License const uint32_t Foam::pTraits<uint32_t>::zero = 0; const uint32_t Foam::pTraits<uint32_t>::one = 1; -const uint32_t Foam::pTraits<uint32_t>::min = INT32_MIN; -const uint32_t Foam::pTraits<uint32_t>::max = INT32_MAX; +const uint32_t Foam::pTraits<uint32_t>::min = 0; +const uint32_t Foam::pTraits<uint32_t>::max = UINT32_MAX; const uint32_t Foam::pTraits<uint32_t>::rootMin = pTraits<uint32_t>::min; const uint32_t Foam::pTraits<uint32_t>::rootMax = pTraits<uint32_t>::max; diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64.C b/src/OpenFOAM/primitives/ints/uint64/uint64.C index b099c4b4e03..112d3a4b885 100644 --- a/src/OpenFOAM/primitives/ints/uint64/uint64.C +++ b/src/OpenFOAM/primitives/ints/uint64/uint64.C @@ -29,8 +29,8 @@ License const uint64_t Foam::pTraits<uint64_t>::zero = 0; const uint64_t Foam::pTraits<uint64_t>::one = 1; -const uint64_t Foam::pTraits<uint64_t>::min = INT64_MIN; -const uint64_t Foam::pTraits<uint64_t>::max = INT64_MAX; +const uint64_t Foam::pTraits<uint64_t>::min = 0; +const uint64_t Foam::pTraits<uint64_t>::max = UINT64_MAX; const uint64_t Foam::pTraits<uint64_t>::rootMin = pTraits<uint64_t>::min; const uint64_t Foam::pTraits<uint64_t>::rootMax = pTraits<uint64_t>::max; -- GitLab