From 978d439e929397e625fab26566cdd3ef66b79610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Wawrzyniec=20Urba=C5=84czyk?= Date: Sat, 3 Nov 2018 13:20:08 +0100 Subject: [PATCH] Add PYBIND11_ prefix to the THROW macro to prevent name collisions. (#1578) --- include/pybind11/pybind11.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h index f326bd72..99a1e0a7 100644 --- a/include/pybind11/pybind11.h +++ b/include/pybind11/pybind11.h @@ -1464,12 +1464,12 @@ struct enum_base { PYBIND11_ENUM_OP_STRICT("__ne__", !int_(a).equal(int_(b)), return true); if (is_arithmetic) { - #define THROW throw type_error("Expected an enumeration of matching type!"); - PYBIND11_ENUM_OP_STRICT("__lt__", int_(a) < int_(b), THROW); - PYBIND11_ENUM_OP_STRICT("__gt__", int_(a) > int_(b), THROW); - PYBIND11_ENUM_OP_STRICT("__le__", int_(a) <= int_(b), THROW); - PYBIND11_ENUM_OP_STRICT("__ge__", int_(a) >= int_(b), THROW); - #undef THROW + #define PYBIND11_THROW throw type_error("Expected an enumeration of matching type!"); + PYBIND11_ENUM_OP_STRICT("__lt__", int_(a) < int_(b), PYBIND11_THROW); + PYBIND11_ENUM_OP_STRICT("__gt__", int_(a) > int_(b), PYBIND11_THROW); + PYBIND11_ENUM_OP_STRICT("__le__", int_(a) <= int_(b), PYBIND11_THROW); + PYBIND11_ENUM_OP_STRICT("__ge__", int_(a) >= int_(b), PYBIND11_THROW); + #undef PYBIND11_THROW } }