Commit 15360734 authored by Dave Moxey's avatar Dave Moxey

Fix issue with non-Linux import of DLFCN, compile error with newer boost version

parent 7c6bdbe3
Pipeline #455 passed with stage
in 0 seconds
......@@ -124,9 +124,12 @@ IF (NEKTAR_BUILD_PYTHON)
FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/NekPy)
FILE(WRITE ${CMAKE_BINARY_DIR}/NekPy/__init__.py "# Adjust dlopen flags to avoid OpenMPI issues
import DLFCN as dl
import sys
sys.setdlopenflags(dl.RTLD_NOW|dl.RTLD_GLOBAL)")
try:
import DLFCN as dl
import sys
sys.setdlopenflags(dl.RTLD_NOW|dl.RTLD_GLOBAL)
except ImportError:
pass")
MARK_AS_ADVANCED(BOOST_PYTHON_LIB)
MARK_AS_ADVANCED(BOOST_NUMPY_LIB)
......
......@@ -144,7 +144,7 @@ void CsvIO::v_ImportFieldData(const std::string inFile, PtsFieldSharedPtr& ptsFi
{
tok.assign(line);
ASSERTL0(distance(tok.begin(), tok.end()) == totvars,
ASSERTL0(std::distance(tok.begin(), tok.end()) == totvars,
"wrong number of columns in line: " + line);
for (auto &it : tok)
......
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