From dabbbf315d61d71e9d0a2cb68e0b9a86e4204459 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 15 Sep 2020 12:10:31 -0400 Subject: [PATCH] fix: use OVERRIDE instead of OVERLOAD (#2490) * fix: use OVERRIDE instead of OVERLOAD * docs: more accurate statement --- docs/advanced/classes.rst | 6 +++--- tests/test_factory_constructors.cpp | 3 ++- tests/test_virtual_functions.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/advanced/classes.rst b/docs/advanced/classes.rst index 82812069b..492790206 100644 --- a/docs/advanced/classes.rst +++ b/docs/advanced/classes.rst @@ -196,9 +196,9 @@ Please take a look at the :ref:`macro_notes` before using this feature. The :c:macro:`PYBIND11_OVERRIDE` and accompanying macros used to be called ``PYBIND11_OVERLOAD`` up until pybind11 v2.5.0, and :func:`get_override` used to be called ``get_overload``. This naming was corrected and the older - macro and function names have been deprecated, in order to reduce confusion - with overloaded functions and methods and ``py::overload_cast`` (see - :ref:`classes`). + macro and function names may soon be deprecated, in order to reduce + confusion with overloaded functions and methods and ``py::overload_cast`` + (see :ref:`classes`). .. seealso:: diff --git a/tests/test_factory_constructors.cpp b/tests/test_factory_constructors.cpp index dcfabacf3..2368dabb8 100644 --- a/tests/test_factory_constructors.cpp +++ b/tests/test_factory_constructors.cpp @@ -89,7 +89,7 @@ public: PyTF6(const PyTF6 &f) : TestFactory6(f) { print_copy_created(this); } PyTF6(std::string s) : TestFactory6((int) s.size()) { alias = true; print_created(this, s); } ~PyTF6() override { print_destroyed(this); } - int get() override { PYBIND11_OVERLOAD(int, TestFactory6, get, /*no args*/); } + int get() override { PYBIND11_OVERRIDE(int, TestFactory6, get, /*no args*/); } }; class TestFactory7 { @@ -110,6 +110,7 @@ public: PyTF7(PyTF7 &&f) : TestFactory7(std::move(f)) { print_move_created(this); } PyTF7(const PyTF7 &f) : TestFactory7(f) { print_copy_created(this); } ~PyTF7() override { print_destroyed(this); } + int get() override { PYBIND11_OVERRIDE(int, TestFactory7, get, /*no args*/); } }; diff --git a/tests/test_virtual_functions.cpp b/tests/test_virtual_functions.cpp index baea1e57a..4fc04acf4 100644 --- a/tests/test_virtual_functions.cpp +++ b/tests/test_virtual_functions.cpp @@ -159,7 +159,7 @@ struct Base { struct DispatchIssue : Base { std::string dispatch() const override { - PYBIND11_OVERLOAD_PURE(std::string, Base, dispatch, /* no arguments */); + PYBIND11_OVERRIDE_PURE(std::string, Base, dispatch, /* no arguments */); } };