diff --git a/pybind11_abseil/tests/absl_example.cc b/pybind11_abseil/tests/absl_example.cc index 00943b8..fd64a55 100644 --- a/pybind11_abseil/tests/absl_example.cc +++ b/pybind11_abseil/tests/absl_example.cc @@ -147,14 +147,14 @@ absl::Cord ReturnAbslCord(const std::string& values) { return cord; } -bool CheckOptional(const absl::optional optional, bool given, int value) { +bool CheckOptional(const std::optional optional, bool given, int value) { if (!given && !optional.has_value()) return true; if (given && optional.has_value() && optional.value() == value) return true; return false; } -absl::optional MakeOptional() { return absl::nullopt; } -absl::optional MakeOptional(int value) { return value; } +std::optional MakeOptional() { return absl::nullopt; } +std::optional MakeOptional(int value) { return value; } absl::flat_hash_map MakeMap( const std::vector>& keys_and_values) { @@ -324,7 +324,7 @@ struct A { struct B { int b; }; -typedef absl::variant AOrB; +typedef std::variant AOrB; int VariantToInt(AOrB value) { if (absl::holds_alternative(value)) { @@ -339,13 +339,13 @@ int VariantToInt(AOrB value) { std::vector IdentityWithCopy(const std::vector& value) { return value; } -std::vector> Identity( - const std::vector>& value) { +std::vector> Identity( + const std::vector>& value) { return value; } -bool CheckVariant(const absl::variant variant, - bool given, int value) { +bool CheckVariant(const std::variant variant, bool given, + int value) { if (!given && !absl::holds_alternative(variant)) return true; if (given && absl::holds_alternative(variant) && absl::get(variant) == value) @@ -353,8 +353,8 @@ bool CheckVariant(const absl::variant variant, return false; } -absl::variant MakeVariant() { return {}; } -absl::variant MakeVariant(int value) { return value; } +std::variant MakeVariant() { return {}; } +std::variant MakeVariant(int value) { return value; } } // namespace test } // namespace pybind11 @@ -468,8 +468,8 @@ PYBIND11_MODULE(absl_example, m) { // absl::optional bindings. m.def("check_optional", &CheckOptional, arg("optional") = absl::nullopt, arg("given") = false, arg("value") = 0); - m.def("make_optional", (absl::optional(*)()) & MakeOptional); - m.def("make_optional", (absl::optional(*)(int)) & MakeOptional, + m.def("make_optional", (std::optional (*)())&MakeOptional); + m.def("make_optional", (std::optional (*)(int))&MakeOptional, arg("value")); // absl::flat_hash_map bindings @@ -501,12 +501,11 @@ PYBIND11_MODULE(absl_example, m) { m.def("IdentityWithCopy", &IdentityWithCopy); m.def("check_variant", &CheckVariant, - arg("variant") = absl::variant{}, + arg("variant") = std::variant{}, arg("given") = false, arg("value") = 0); + m.def("make_variant", (std::variant (*)())&MakeVariant); m.def("make_variant", - (absl::variant (*)())&MakeVariant); - m.def("make_variant", - (absl::variant (*)(int))&MakeVariant, + (std::variant (*)(int))&MakeVariant, arg("value")); }