simplify

Author: EricCousineau-TRI

include/pybind11/pybind11.h

@@ -46,7 +46,6 @@
 #include "options.h"
 #include "detail/class.h"
 #include "detail/init.h"
-#include "detail/typeid.h"
 
 #include <memory>
 #include <vector>
@@ -1570,23 +1569,6 @@ inline str enum_name(handle arg) {
     return "???";
 }
 
-template <typename Type, typename Scalar, bool is_convertible = true>
-struct enum_value {
-    static Scalar run(handle arg) {
-        Type value = pybind11::cast<Type>(arg);
-        return static_cast<Scalar>(value);
-    }
-};
-
-template <typename Type, typename Scalar>
-struct enum_value<Type, Scalar, false> {
-    static Scalar run(handle) {
-      throw pybind11::cast_error(
-            "Enum for " + type_id<Type>() + " is not convertible to " +
-            type_id<Scalar>());
-    }
-};
-
 struct enum_base {
     enum_base(handle base, handle parent) : m_base(base), m_parent(parent) { }
 
@@ -1737,6 +1719,7 @@ template <typename Type> class enum_ : public class_<Type> {
     using Base = class_<Type>;
     using Base::def;
     using Base::attr;
+    using Base::def_property;
     using Base::def_property_readonly;
     using Base::def_property_readonly_static;
     using Scalar = typename std::underlying_type<Type>::type;
@@ -1746,15 +1729,10 @@ template <typename Type> class enum_ : public class_<Type> {
       : class_<Type>(scope, name, extra...), m_base(*this, scope) {
         constexpr bool is_arithmetic = detail::any_of<std::is_same<arithmetic, Extra>...>::value;
         constexpr bool is_convertible = std::is_convertible<Type, Scalar>::value;
-        auto property = handle((PyObject *) &PyProperty_Type);
         m_base.init(is_arithmetic, is_convertible);
 
-        attr("value") = property(
-            cpp_function(
-                &detail::enum_value<Type, Scalar, is_convertible>::run,
-                pybind11::name("value"), is_method(*this)));
-
         def(init([](Scalar i) { return static_cast<Type>(i); }), arg("value"));
+        def_property("value", [](Type value) { return (Scalar) value; }, nullptr);
         def("__int__", [](Type value) { return (Scalar) value; });
         #if PY_MAJOR_VERSION < 3
             def("__long__", [](Type value) { return (Scalar) value; });