Commit ee62b2bb authored by Chris Cantwell's avatar Chris Cantwell

Fix warnings issued by clang on OSX El Capitan.

parent e166b0d4
Pipeline #1143 failed with stages
......@@ -421,7 +421,7 @@ std::array<NekDouble, 6> Geometry::GetBoundingBox()
}
// Return bounding box
return { min[0], min[1], min[2], max[0], max[1], max[2] };
return {{ min[0], min[1], min[2], max[0], max[1], max[2] }};
}
/**
......
......@@ -187,7 +187,7 @@ namespace Nektar
// chiRoe and kappaRoe (eq 66)
NekDouble chiRoe, kappaRoe;
NekDouble fac = D - deltaP*deltaRho;
if( abs(fac) > NekConstants::kNekZeroTol)
if( std::abs(fac) > NekConstants::kNekZeroTol)
{
chiRoe = (D*avgChi + s*s*deltaRho*dP) / fac;
kappaRoe = D*avgKappa / fac;
......
......@@ -48,13 +48,13 @@ ADD_DEPENDENCIES(Tester boost tinyxml-2.6.2)
IF( ${CMAKE_SYSTEM} MATCHES "Linux.*")
TARGET_LINK_LIBRARIES(Tester optimized rt debug rt)
SET_PROPERTY(TARGET Tester APPEND_STRING PROPERTY COMPILE_FLAGS " -pthread")
SET_PROPERTY(TARGET Tester APPEND_STRING PROPERTY LINK_FLAGS " -pthread")
ENDIF()
IF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_TARGET_PROPERTIES(Tester
PROPERTIES LINK_FLAGS "-Wl,-undefined,dynamic_lookup -Wl,-rpath,${Boost_LIBRARY_DIRS}")
SET_PROPERTY(TARGET Tester APPEND_STRING PROPERTY COMPILE_FLAGS " -pthread")
SET_PROPERTY(TARGET Tester APPEND_STRING PROPERTY LINK_FLAGS " -pthread")
ENDIF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_TARGET_PROPERTIES(Tester
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment