From 6aba1630eda366e0bf02b4f8b77044b9f7541f4d Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sun, 24 Jun 2018 22:15:40 -0400 Subject: [PATCH] Minor corrections for compiling under macOS High Sierra (10.13.5) using the stock compiler Apple LLVM version 9.1.0 (clang-902.0.39.2) --- .../solvers/overset/simpleMRFOversetFoam/Make/options | 1 + .../solvers/overset/simpleOversetFoam/Make/options | 1 + src/foam/primitives/ints/uint64/uint64.H | 4 ++++ src/foam/primitives/ints/uint64/uint64IO.C | 8 ++++++++ 4 files changed, 14 insertions(+) diff --git a/applications/solvers/overset/simpleMRFOversetFoam/Make/options b/applications/solvers/overset/simpleMRFOversetFoam/Make/options index 1c5c9b88d..0b6d9bd5b 100644 --- a/applications/solvers/overset/simpleMRFOversetFoam/Make/options +++ b/applications/solvers/overset/simpleMRFOversetFoam/Make/options @@ -11,6 +11,7 @@ EXE_INC = \ EXE_LIBS = \ -lincompressibleRASModels \ -lincompressibleTransportModels \ + -lincompressibleTurbulenceModel \ -lfiniteVolume \ -loversetMesh \ -llduSolvers diff --git a/applications/solvers/overset/simpleOversetFoam/Make/options b/applications/solvers/overset/simpleOversetFoam/Make/options index 1c5c9b88d..0b6d9bd5b 100644 --- a/applications/solvers/overset/simpleOversetFoam/Make/options +++ b/applications/solvers/overset/simpleOversetFoam/Make/options @@ -11,6 +11,7 @@ EXE_INC = \ EXE_LIBS = \ -lincompressibleRASModels \ -lincompressibleTransportModels \ + -lincompressibleTurbulenceModel \ -lfiniteVolume \ -loversetMesh \ -llduSolvers diff --git a/src/foam/primitives/ints/uint64/uint64.H b/src/foam/primitives/ints/uint64/uint64.H index e31192fa0..2626e59f9 100644 --- a/src/foam/primitives/ints/uint64/uint64.H +++ b/src/foam/primitives/ints/uint64/uint64.H @@ -69,6 +69,10 @@ bool read(const char*, uint64_t&); Istream& operator>>(Istream&, uint64_t&); Ostream& operator<<(Ostream&, const uint64_t); +#if WM_ARCH_OPTION == 64 && darwin && __clang__ +Ostream& operator<<(Ostream&, const uintptr_t); +#endif + //- Template specialization for pTraits template<> class pTraits diff --git a/src/foam/primitives/ints/uint64/uint64IO.C b/src/foam/primitives/ints/uint64/uint64IO.C index 105f5d7f3..eae780175 100644 --- a/src/foam/primitives/ints/uint64/uint64IO.C +++ b/src/foam/primitives/ints/uint64/uint64IO.C @@ -98,5 +98,13 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const uint64_t i) return os; } +#if WM_ARCH_OPTION == 64 && darwin && __clang__ +Foam::Ostream& Foam::operator<<(Ostream& os, const uintptr_t i) +{ + os.write(label(i)); + os.check("Ostream& operator<<(Ostream&, const uintptr_t)"); + return os; +} +#endif // ************************************************************************* //