From ccacbadda1b342ca913008ab41bcf09c9d414145 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 23 Jan 2012 10:14:05 +0000 Subject: [PATCH] OpenFOAM: avoid duplicate definitions when compiling SP --- src/OpenFOAM/Make/files | 2 ++ src/OpenFOAM/primitives/Vector/floatVector/floatVector.H | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index 4bab8ad32a..fefabee690 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -45,7 +45,9 @@ primitives/Tensor/lists/symmTensorList.C primitives/Tensor/lists/tensorList.C primitives/Vector/complexVector/complexVector.C +#if !defined(WM_SP) primitives/Vector/floatVector/floatVector.C +#endif primitives/Vector/labelVector/labelVector.C primitives/Vector/vector/vector.C primitives/Vector/lists/vectorList.C diff --git a/src/OpenFOAM/primitives/Vector/floatVector/floatVector.H b/src/OpenFOAM/primitives/Vector/floatVector/floatVector.H index 438adc1776..9d8eee773d 100644 --- a/src/OpenFOAM/primitives/Vector/floatVector/floatVector.H +++ b/src/OpenFOAM/primitives/Vector/floatVector/floatVector.H @@ -47,11 +47,11 @@ namespace Foam typedef Vector floatVector; - //- Data associated with floatVector type are contiguous +#if !defined(WM_SP) template<> inline bool contiguous() {return true;} - +#endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //