OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #246 from rolk/246_bind

Browse Source 
Use boost::bind instead of std::bind to compile with C++03
This commit is contained in:
Atgeirr Flø Rasmussen
2013-05-23 00:19:34 -07:00
parent 7ee481a601 eefb7a0431
commit 729d17785b
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Modules/Finddune-common.cmake
View File

@@ -16,7 +16,7 @@ find_opm_package (
"dune-common"
# dependencies
"CXX11Features REQUIRED;
"CXX11Features;
BLAS REQUIRED;
LAPACK REQUIRED;
MPI

2
cmake/Modules/Finddune-geometry.cmake
View File

@@ -19,7 +19,7 @@ find_opm_package (
# TODO: we should probe for all the HAVE_* values listed below;
# however, we don't actually use them in our implementation, so
# we just include them to forward here in case anyone else does
"CXX11Features REQUIRED;
"CXX11Features;
dune-common REQUIRED
"
# header to search for

2
cmake/Modules/Finddune-grid.cmake
View File

@@ -19,7 +19,7 @@ find_opm_package (
# TODO: we should probe for all the HAVE_* values listed below;
# however, we don't actually use them in our implementation, so
# we just include them to forward here in case anyone else does
"CXX11Features REQUIRED;
"CXX11Features;
dune-common REQUIRED;
dune-geometry REQUIRED
"

2
opm/core/simulator/SimulatorIncompTwophase.hpp
View File

@@ -22,7 +22,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/function.hpp>
#include <functional> // bind
#include <boost/bind.hpp>
#include <vector>
struct UnstructuredGrid;

2
opm/core/simulator/SimulatorIncompTwophase_impl.hpp
View File

@@ -6,7 +6,7 @@ namespace Opm {
template <typename T, void (T::*callback)()>
inline void SimulatorIncompTwophase::connect_timestep (T& t) {
connect_timestep_impl (boost::function0<void> (std::bind (callback, t)));
connect_timestep_impl (boost::function0<void> (boost::bind (callback, t)));
}
} /* namespace Opm */