exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor corrections for compiling under macOS High Sierra (10.13.5) using

Browse source 
the stock compiler Apple LLVM version 9.1.0 (clang-902.0.39.2)
This commit is contained in:
Martin Beaudoin 2018-06-24 22:15:40 -04:00
parent e01e16c943
commit 6aba1630ed
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
applications/solvers/overset/simpleMRFOversetFoam/Make/options
View file

@ -11,6 +11,7 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-lincompressibleRASModels \ -lincompressibleRASModels \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lfiniteVolume \ -lfiniteVolume \
-loversetMesh \ -loversetMesh \
-llduSolvers -llduSolvers

1
applications/solvers/overset/simpleOversetFoam/Make/options
View file

@ -11,6 +11,7 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-lincompressibleRASModels \ -lincompressibleRASModels \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lfiniteVolume \ -lfiniteVolume \
-loversetMesh \ -loversetMesh \
-llduSolvers -llduSolvers

4
src/foam/primitives/ints/uint64/uint64.H
View file

@ -69,6 +69,10 @@ bool read(const char*, uint64_t&);
Istream& operator>>(Istream&, uint64_t&); Istream& operator>>(Istream&, uint64_t&);
Ostream& operator<<(Ostream&, const 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<uint64_t> //- Template specialization for pTraits<uint64_t>
template<> template<>
class pTraits<uint64_t> class pTraits<uint64_t>

8
src/foam/primitives/ints/uint64/uint64IO.C
View file

@ -98,5 +98,13 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const uint64_t i)
return os; 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
// ************************************************************************* // // ************************************************************************* //