From ed014a099c86bf938391f5b15f8bc850b2f3aa4d Mon Sep 17 00:00:00 2001 From: Henry Weller <http://cfd.direct> Date: Fri, 1 Jul 2016 14:52:54 +0100 Subject: [PATCH] src/OpenFOAM/primitives/ints: Further tweaks Resolved additional bug-report http://bugs.openfoam.org/view.php?id=2137 --- src/OpenFOAM/primitives/ints/int32/int32.H | 4 ---- src/OpenFOAM/primitives/ints/uLabel/uLabel.H | 1 - src/OpenFOAM/primitives/ints/uint32/uint32.C | 2 +- src/OpenFOAM/primitives/ints/uint32/uint32.H | 4 ---- src/OpenFOAM/primitives/ints/uint64/uint64.C | 2 +- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/OpenFOAM/primitives/ints/int32/int32.H b/src/OpenFOAM/primitives/ints/int32/int32.H index d2601ad67cb..de8baa21093 100644 --- a/src/OpenFOAM/primitives/ints/int32/int32.H +++ b/src/OpenFOAM/primitives/ints/int32/int32.H @@ -45,10 +45,6 @@ SourceFiles #include "pTraits.H" #include "direction.H" -#ifndef UINT32_MIN -#define UINT32_MIN 0 -#endif - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H index 4a269526b1c..0c712fa3768 100644 --- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H +++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H @@ -58,7 +58,6 @@ namespace Foam typedef UINT_SIZE(uint, _t) uLabel; -static const uLabel uLabelMin = UINT_SIZE(UINT, _MIN); static const uLabel uLabelMax = UINT_SIZE(UINT, _MAX); inline uLabel readULabel(Istream& is) diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.C b/src/OpenFOAM/primitives/ints/uint32/uint32.C index 8f26f6ab72c..2fec72846d5 100644 --- a/src/OpenFOAM/primitives/ints/uint32/uint32.C +++ b/src/OpenFOAM/primitives/ints/uint32/uint32.C @@ -31,7 +31,7 @@ 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 = 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>::rootMin = 0; const uint32_t Foam::pTraits<uint32_t>::rootMax = pTraits<uint32_t>::max; const char* const Foam::pTraits<uint32_t>::componentNames[] = { "" }; diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.H b/src/OpenFOAM/primitives/ints/uint32/uint32.H index 83c3b18c67a..34803c218ff 100644 --- a/src/OpenFOAM/primitives/ints/uint32/uint32.H +++ b/src/OpenFOAM/primitives/ints/uint32/uint32.H @@ -45,10 +45,6 @@ SourceFiles #include "pTraits.H" #include "direction.H" -#ifndef UINT32_MIN -#define UINT32_MIN 0 -#endif - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64.C b/src/OpenFOAM/primitives/ints/uint64/uint64.C index 112d3a4b885..b4ca245d250 100644 --- a/src/OpenFOAM/primitives/ints/uint64/uint64.C +++ b/src/OpenFOAM/primitives/ints/uint64/uint64.C @@ -31,7 +31,7 @@ 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 = 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>::rootMin = 0; const uint64_t Foam::pTraits<uint64_t>::rootMax = pTraits<uint64_t>::max; const char* const Foam::pTraits<uint64_t>::componentNames[] = { "" }; -- GitLab