Merge pull request #115 from olivier-stasse/devel

Bug fixes
stack-of-tasks · Oct 25, 2023 · 5330bd0 · 5330bd0
2 parents 380360b + f683732
commit 5330bd0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2010-2020, Florent Lamiraux, Thomas Moulard, Olivier Stasse, Guilhem
 # Saurel, JRL, CNRS/AIST, LAAS-CNRS
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 
 # Project properties
 set(PROJECT_ORG stack-of-tasks)

diff --git a/cmake b/cmake
diff --git a/include/dynamic-graph/python/interpreter.hh b/include/dynamic-graph/python/interpreter.hh
@@ -51,8 +51,6 @@ class DYNAMIC_GRAPH_PYTHON_DLLAPI Interpreter {
   PyThreadState* _pyState;
   /// Pointer to the dictionary of global variables
   PyObject* globals_;
-  /// Pointer to the dictionary of local variables
-  PyObject* locals_;
   PyObject* mainmod_;
 };
 }  // namespace python

diff --git a/src/dynamic_graph/convert-dg-to-py.cc b/src/dynamic_graph/convert-dg-to-py.cc
@@ -8,6 +8,7 @@
 
 #include <boost/python.hpp>
 #include <boost/python/stl_iterator.hpp>
+#include <cstdint>
 #include <iostream>
 #include <sstream>
 
@@ -30,11 +31,11 @@ command::Value toValue(bp::object o, const command::Value::Type& valueType) {
     case (Value::UNSIGNED):
       return Value(bp::extract<unsigned>(o));
     case (Value::UNSIGNEDLONGINT):
-      return Value(bp::extract<unsigned long int>(o));
+      return Value(bp::extract<std::uint64_t>(o));
     case (Value::INT):
       return Value(bp::extract<int>(o));
     case (Value::LONGINT):
-      return Value(bp::extract<long int>(o));
+      return Value(bp::extract<std::int64_t>(o));
     case (Value::FLOAT):
       return Value(bp::extract<float>(o));
     case (Value::DOUBLE):

diff --git a/src/dynamic_graph/entity-py.cc b/src/dynamic_graph/entity-py.cc
@@ -83,8 +83,11 @@ bp::object executeCmd(bp::tuple args, bp::dict) {
     throw std::out_of_range("Wrong number of arguments");
   std::vector<Value> values;
   values.reserve(command.valueTypes().size());
-  for (int i = 1; i < bp::len(args); ++i)
-    values.push_back(convert::toValue(args[i], command.valueTypes()[i - 1]));
+  for (bp::ssize_t i = 1; i < bp::len(args); ++i)
+    values.push_back(convert::toValue(
+        args[i],
+        command
+            .valueTypes()[static_cast<std::vector<Value>::size_type>(i - 1)]));
   command.setParameterValues(values);
   return convert::fromValue(command.execute());
 }

diff --git a/src/interpreter.cc b/src/interpreter.cc
@@ -247,9 +247,9 @@ void Interpreter::runMain(void) {
 
 std::string Interpreter::processStream(std::istream& stream, std::ostream& os) {
   char line[10000];
-  sprintf(line, "%s", "\n");
-  std::string command;
   std::streamsize maxSize = 10000;
+  snprintf(line, static_cast<size_t>(maxSize), "%s", "\n");
+  std::string command;
 #if 0
   while (line != std::string("")) {
     stream.getline(line, maxSize, '\n');
+240 −0		.cmake-format.py
+0 −3		.docs/cmake.py
+0 −1		.docs/conf.py
+1 −9		.github/workflows/cmake.yml
+12 −4		.pre-commit-config.yaml
+5 −1		Config.cmake.in
+0 −5		GNUInstallDirs.cmake
+7 −3		README.md
+0 −1		_unittests/test_pkg-config.cmake
+58 −28		base.cmake
+0 −4		boost/FindBoost.cmake
+0 −1		cmake_reinstall.cmake.in
+0 −1		cmake_uninstall.cmake.in
+0 −42		compile.py
+6 −42		cxx11.cmake
+310 −10		cython/cython.cmake
+1 −1		cython/python/FindPython/Support.cmake
+1 −1		cython/setup.in.py
+48 −32		doxygen.cmake
+11 −6		find-external/GMP/FindGMP.cmake
+8 −7		find-external/MPFR/FindMPFR.cmake
+767 −18		find-external/OpenMP/FindOpenMP.cmake
+14 −5		find-external/Simde/FindSimde.cmake
+1 −1		find-external/qpOASES/FindqpOASES.cmake
+2 −2		hpp/idl/omniidl_be_python_with_docstring.py
+22 −18		logging.cmake
+0 −4		msvc-specific.cmake
+30 −7		pkg-config.cmake
+10 −2		post-project.cmake
+115 −0		python-helpers.cmake
+17 −153		python.cmake
+0 −171		python/FindPythonInterp.cmake
+0 −399		python/FindPythonLibs.cmake
+49 −0		relpath.cmake
+15 −5		stubs.cmake
+9 −5		test.cmake
+4 −1		uninstall.cmake
+0 −3		version-script.cmake
+3 −8		version.cmake