Merge branch 'master' of https://github.com/InteractiveComputerGraphics/SPlisHSPlasH into master

Author: janbender

pySPlisHSPlasH/FluidModelModule.cpp

@@ -138,20 +138,20 @@ void FluidModelModule(py::module m_sub){
 		.def("emittedParticles", &SPH::FluidModel::emittedParticles)
 
 		.def("getSurfaceTensionMethod", &SPH::FluidModel::getSurfaceTensionMethod)
-		.def("setViscosityMethod", py::overload_cast<const unsigned int>(&SPH::FluidModel::setSurfaceTensionMethod))
-		.def("setViscosityMethod", py::overload_cast<const std::string&>(&SPH::FluidModel::setSurfaceTensionMethod))
+		.def("setViscosityMethod", overload_cast_<const unsigned int>()(&SPH::FluidModel::setSurfaceTensionMethod))
+		.def("setViscosityMethod", overload_cast_<const std::string&>()(&SPH::FluidModel::setSurfaceTensionMethod))
 		.def("getViscosityMethod", &SPH::FluidModel::getViscosityMethod)
-		.def("setViscosityMethod", py::overload_cast<const unsigned int>(&SPH::FluidModel::setViscosityMethod))
-		.def("setViscosityMethod", py::overload_cast<const std::string &>(&SPH::FluidModel::setViscosityMethod))
+		.def("setViscosityMethod", overload_cast_<const unsigned int>()(&SPH::FluidModel::setViscosityMethod))
+		.def("setViscosityMethod", overload_cast_<const std::string &>()(&SPH::FluidModel::setViscosityMethod))
 		.def("getVorticityMethod", &SPH::FluidModel::getVorticityMethod)
-		.def("setViscosityMethod", py::overload_cast<const unsigned int>(&SPH::FluidModel::setVorticityMethod))
-		.def("setViscosityMethod", py::overload_cast<const std::string &>(&SPH::FluidModel::setVorticityMethod))
+		.def("setViscosityMethod", overload_cast_<const unsigned int>()(&SPH::FluidModel::setVorticityMethod))
+		.def("setViscosityMethod", overload_cast_<const std::string &>()(&SPH::FluidModel::setVorticityMethod))
 		.def("getDragMethod", &SPH::FluidModel::getDragMethod)
-		.def("setViscosityMethod", py::overload_cast<const unsigned int>(&SPH::FluidModel::setDragMethod))
-		.def("setViscosityMethod", py::overload_cast<const std::string &>(&SPH::FluidModel::setDragMethod))
+		.def("setViscosityMethod", overload_cast_<const unsigned int>()(&SPH::FluidModel::setDragMethod))
+		.def("setViscosityMethod", overload_cast_<const std::string &>()(&SPH::FluidModel::setDragMethod))
 		.def("getElasticityMethod", &SPH::FluidModel::getElasticityMethod)
-		.def("setViscosityMethod", py::overload_cast<const unsigned int>(&SPH::FluidModel::setElasticityMethod))
-		.def("setViscosityMethod", py::overload_cast<const std::string &>(&SPH::FluidModel::setElasticityMethod))
+		.def("setViscosityMethod", overload_cast_<const unsigned int>()(&SPH::FluidModel::setElasticityMethod))
+		.def("setViscosityMethod", overload_cast_<const std::string &>()(&SPH::FluidModel::setElasticityMethod))
 
 		.def("getSurfaceTensionBase", &SPH::FluidModel::getSurfaceTensionBase, py::return_value_policy::reference_internal)
 		.def("getViscosityBase", &SPH::FluidModel::getViscosityBase, py::return_value_policy::reference_internal)