From 983ee8f59841edfbd0f360d1efe9654b9283b758 Mon Sep 17 00:00:00 2001 From: Jonathan Lambrechts <jonathan.lambrechts@uclouvain.be> Date: Tue, 16 Nov 2010 13:49:26 +0000 Subject: [PATCH] dgpy ! --- CMakeLists.txt | 2 +- Solver/function.cpp | 5 ----- Solver/function.h | 9 ++++++++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab54efc27f..59db790ef7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1129,5 +1129,5 @@ if(ENABLE_SWIG_EXPERIMENTAL) SET_SOURCE_FILES_PROPERTIES(Geo/GModel.i PROPERTIES CPLUSPLUS ON) #SET_SOURCE_FILES_PROPERTIES(Geo/GModel.i SWIG_FLAGS "-includeall -importall") SWIG_ADD_MODULE(gmshPython python Geo/GModel.i ${GMSH_SRC}) - SWIG_LINK_LIBRARIES(gmshPython ${PYTHON_LIBRARIES} ${EXTERNAL_LIBRARIES}) + SWIG_LINK_LIBRARIES(gmshPython ${PYTHON_LIBRARIES} ${EXTERNAL_LIBRARIES} ${LINK_LIBRARIES}) endif(ENABLE_SWIG_EXPERIMENTAL) diff --git a/Solver/function.cpp b/Solver/function.cpp index 8222f35b50..2517fc72a0 100644 --- a/Solver/function.cpp +++ b/Solver/function.cpp @@ -12,11 +12,6 @@ #include <dlfcn.h> #endif -struct functionReplaceCache { - dataCacheMap *map; - std::vector <dataCacheDouble*> toReplace; - std::vector <dataCacheDouble*> toCompute; -}; // function diff --git a/Solver/function.h b/Solver/function.h index 2c3876df21..c53801f114 100644 --- a/Solver/function.h +++ b/Solver/function.h @@ -14,7 +14,7 @@ class dgDataCacheMap; class function; class functionConstant; class functionReplace; -struct functionReplaceCache; +class functionReplaceCache; class MElement; class binding; @@ -110,6 +110,13 @@ class functionSolution : public function { } }; +class functionReplaceCache { + public: + dataCacheMap *map; + std::vector <dataCacheDouble*> toReplace; + std::vector <dataCacheDouble*> toCompute; +}; + class functionReplace { friend class dataCacheMap; friend class dataCacheDouble; -- GitLab