From 0afe3c9cd8d67d21ac1115576f88cb86d9ef2134 Mon Sep 17 00:00:00 2001
From: ManifoldFR <wilson.jallet@polytechnique.org>
Date: Thu, 6 Apr 2023 19:00:01 +0200
Subject: [PATCH] optional: add support for std::optional under cpp17
---
include/eigenpy/optional.hpp | 33 +++++++++++++++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/include/eigenpy/optional.hpp b/include/eigenpy/optional.hpp
index 38f167db..949b8419 100644
--- a/include/eigenpy/optional.hpp
+++ b/include/eigenpy/optional.hpp
@@ -8,17 +8,28 @@
#include "eigenpy/fwd.hpp"
#include "eigenpy/eigen-from-python.hpp"
#include <boost/optional.hpp>
+#ifdef EIGENPY_WITH_CXX17_SUPPORT
+#include <optional>
+#endif
+#ifndef EIGENPY_DEFAULT_OPTIONAL
#define EIGENPY_DEFAULT_OPTIONAL boost::optional
+#endif
namespace boost {
namespace python {
namespace converter {
template <typename T>
-struct expected_pytype_for_arg<EIGENPY_DEFAULT_OPTIONAL<T> >
+struct expected_pytype_for_arg<boost::optional<T> >
: expected_pytype_for_arg<T> {};
+#ifdef EIGENPY_WITH_CXX17_SUPPORT
+template <typename T>
+struct expected_pytype_for_arg<std::optional<T> >
+ : expected_pytype_for_arg<T> {};
+#endif
+
} // namespace converter
} // namespace python
} // namespace boost
@@ -26,6 +37,24 @@ struct expected_pytype_for_arg<EIGENPY_DEFAULT_OPTIONAL<T> >
namespace eigenpy {
namespace detail {
+/// Helper struct to decide which type is the "none" type for a specific optional<T> implementation.
+template<template <typename> class OptionalTpl>
+struct nullopt_helper {};
+
+template<>
+struct nullopt_helper<boost::optional> {
+ typedef boost::none_t type;
+ static type value() { return boost::none; }
+};
+
+#ifdef EIGENPY_WITH_CXX17_SUPPORT
+template<>
+struct nullopt_helper<std::optional> {
+ typedef std::nullopt_t type;
+ static type value() { return std::nullopt; }
+};
+#endif
+
template <typename T,
template <typename> class OptionalTpl = EIGENPY_DEFAULT_OPTIONAL>
struct OptionalToPython {
@@ -80,7 +109,7 @@ void OptionalFromPython<T, OptionalTpl>::construct(
->storage.bytes;
if (obj_ptr == Py_None) {
- new (storage) OptionalTpl<T>(boost::none);
+ new (storage) OptionalTpl<T>(nullopt_helper<OptionalTpl>::value());
} else {
const T value = bp::extract<T>(obj_ptr);
new (storage) OptionalTpl<T>(value);
--
GitLab