From d99e314ae5292c8a5437a5e93c934b084785a893 Mon Sep 17 00:00:00 2001 From: Olivier Coulaud <Olivier.Coulaud@inria.fr> Date: Tue, 13 Mar 2018 16:09:45 +0100 Subject: [PATCH] Fix compilation problems on Macos X --- Src/Kernels/Taylor/FTaylorKernel.hpp | 2 +- Utils/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Kernels/Taylor/FTaylorKernel.hpp b/Src/Kernels/Taylor/FTaylorKernel.hpp index c323c49d2..bc76487b6 100644 --- a/Src/Kernels/Taylor/FTaylorKernel.hpp +++ b/Src/Kernels/Taylor/FTaylorKernel.hpp @@ -186,7 +186,7 @@ private: FReal combin(const int& a, const int& b){ // use assert to remove the following warning with gcc // error: assuming signed overflow does not occur when assuming that (X + c) < X is always false [-Werror=strict-overflow] - assert(("combin :: Error combin negative!!",a>=b)); + assert(("combin :: Error combin negative!!" &&a>=b)); // if(a<b) {printf("combin :: Error combin negative!! a=%d b=%d\n",a,b); exit(-1) ; } return factorials[a]/ (factorials[b]* factorials[a-b]) ; } diff --git a/Utils/CMakeLists.txt b/Utils/CMakeLists.txt index 681a92634..f673e712d 100644 --- a/Utils/CMakeLists.txt +++ b/Utils/CMakeLists.txt @@ -19,6 +19,7 @@ file( INCLUDE_DIRECTORIES( ${SCALFMM_BINARY_DIR}/Src ${SCALFMM_SOURCE_DIR}/Src + ${SCALFMM_SOURCE_DIR}/Contribs ${SCALFMM_INCLUDES} ) -- GitLab