X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdac506670725ae4fe40b3b1a31ceeb9488ce53a..a44ff15a6114ee1fbcb9a8f9b1269fea19806013:/src/bindings/python/simgrid_python.cpp

diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp
index 211e65053e..eb7456308c 100644
--- a/src/bindings/python/simgrid_python.cpp
+++ b/src/bindings/python/simgrid_python.cpp
@@ -3,8 +3,13 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#ifdef _WIN32
+#warning Try to work around https://bugs.python.org/issue11566
+#define _hypot hypot
+#endif
+
 #include <pybind11/functional.h>
-#include <pybind11/pybind11.h> // Must be first
+#include <pybind11/pybind11.h> // Must come before our own stuff
 #include <pybind11/stl.h>
 
 #include "src/kernel/context/Context.hpp"
@@ -32,7 +37,9 @@ namespace {
 
 static std::string get_simgrid_version()
 {
-  int major, minor, patch;
+  int major;
+  int minor;
+  int patch;
   sg_version_get(&major, &minor, &patch);
   return simgrid::xbt::string_printf("%i.%i.%i", major, minor, patch);
 }
@@ -49,7 +56,7 @@ PYBIND11_MODULE(simgrid, m)
   m.attr("simgrid_version") = simgrid_version;
 
   // Internal exception used to kill actors and sweep the RAII chimney (free objects living on the stack)
-  py::object pyStopRequestEx = py::register_exception<simgrid::kernel::context::Context::StopRequest>(m, "ActorKilled");
+  py::object pyStopRequestEx = py::register_exception<simgrid::kernel::context::StopRequest>(m, "ActorKilled");
 
   /* this_actor namespace */
   void (*sleep_for_fun)(double) = &simgrid::s4u::this_actor::sleep_for; // pick the right overload
@@ -62,7 +69,7 @@ PYBIND11_MODULE(simgrid, m)
          "Block the current actor, computing the given amount of flops at the given priority, see :cpp:func:`void "
          "simgrid::s4u::this_actor::execute(double, double)`",
          py::arg("flops"), py::arg("priority") = 1);
-  m2.def("get_host", &simgrid::s4u::this_actor::get_host, "Retrives host on which the current actor is located");
+  m2.def("get_host", &simgrid::s4u::this_actor::get_host, "Retrieves host on which the current actor is located");
   m2.def("migrate", &simgrid::s4u::this_actor::migrate, "Moves the current actor to another host, see :cpp:func:`void simgrid::s4u::this_actor::migrate()`",
       py::arg("dest"));
   m2.def("sleep_for", sleep_for_fun,
@@ -77,7 +84,7 @@ PYBIND11_MODULE(simgrid, m)
          [](py::object fun) {
            ActorPtr act = Actor::self();
            simgrid::s4u::this_actor::on_exit(
-               [act, fun](int ignored, void* data) {
+               [act, fun](int /*ignored*/, void* /*data*/) {
                  try {
                    fun();
                  } catch (py::error_already_set& e) {
@@ -109,7 +116,7 @@ PYBIND11_MODULE(simgrid, m)
            ":cpp:func:`simgrid::s4u::Engine::load_deployment()`")
       .def("run", &Engine::run, "Run the simulation")
       .def("register_actor",
-           [pyStopRequestEx](Engine*, std::string name, py::object fun_or_class) {
+           [pyStopRequestEx](Engine*, const std::string& name, py::object fun_or_class) {
              simgrid::simix::register_function(
                  name, [pyStopRequestEx, fun_or_class](std::vector<std::string> args) -> simgrid::simix::ActorCode {
                    return [pyStopRequestEx, fun_or_class, args]() {