Various minor cleanups

Author: jagerman

include/pybind11/cast.h

@@ -221,7 +221,7 @@ struct value_and_holder {
         return reinterpret_cast<V *&>(vh[0]);
     }
     // True if this `value_and_holder` has a non-null value pointer
-    operator bool() const { return value_ptr(); }
+    explicit operator bool() const { return value_ptr(); }
 
     template <typename H> H &holder() const {
         return reinterpret_cast<H &>(vh[1]);
@@ -254,18 +254,17 @@ struct values_and_holders {
         instance *inst;
         using vec_iter = std::vector<detail::type_info *>::const_iterator;
         vec_iter typeit;
-        size_t end;
         value_and_holder curr;
         friend struct values_and_holders;
         iterator(instance *inst, const type_vec &tinfo)
-            : inst{inst}, typeit{tinfo.begin()}, end{tinfo.size()},
+            : inst{inst}, typeit{tinfo.begin()},
             curr(inst /* instance */,
-                 end > 0 ? *typeit : nullptr /* type info */,
+                 tinfo.size() > 0 ? *typeit : nullptr /* type info */,
                  0, /* vpos: (non-simple types only): the first vptr comes first */
                  0 /* index */)
         {}
         // Past-the-end iterator:
-        iterator(size_t end) : end{end}, curr(end) {}
+        iterator(size_t end) : curr(end) {}
     public:
         bool operator==(const iterator &other) { return curr.index == other.curr.index; }
         bool operator!=(const iterator &other) { return curr.index != other.curr.index; }
@@ -346,7 +345,6 @@ PYBIND11_NOINLINE inline void instance::allocate_layout() {
         // values that tracks whether each associated holder has been initialized.  Each [block] is
         // padded, if necessary, to an integer multiple of sizeof(void *).
         size_t space = 0;
-        size_in_ptrs(n_types);
         for (auto t : tinfo) {
             space += 1; // value pointer
             space += t->holder_size_in_ptrs; // holder instance
@@ -361,8 +359,10 @@ PYBIND11_NOINLINE inline void instance::allocate_layout() {
         // just wrappers around malloc.
 #if PY_VERSION_HEX >= 0x03050000
         nonsimple.values_and_holders = (void **) PyMem_Calloc(space, sizeof(void *));
+        if (!nonsimple.values_and_holders) throw std::bad_alloc();
 #else
         nonsimple.values_and_holders = (void **) PyMem_New(void *, space);
+        if (!nonsimple.values_and_holders) throw std::bad_alloc();
         std::memset(nonsimple.values_and_holders, 0, space * sizeof(void *));
 #endif
         nonsimple.holder_constructed = reinterpret_cast<unsigned char *>(&nonsimple.values_and_holders[flags_at]);

include/pybind11/class_support.h

@@ -528,7 +528,6 @@ inline PyObject* make_new_python_type(const type_record &rec) {
     type->tp_doc = tp_doc;
     type->tp_base = (PyTypeObject *) handle(base).inc_ref().ptr();
     type->tp_basicsize = static_cast<ssize_t>(sizeof(instance));
-    //type->tp_itemsize = 16;
     if (bases.size() > 0)
         type->tp_bases = bases.release().ptr();
 

include/pybind11/common.h

@@ -365,7 +365,6 @@ constexpr size_t instance_simple_holder_in_ptrs() {
 
 // Forward declarations
 struct type_info;
-struct all_type_info;
 struct value_and_holder;
 
 /// The 'instance' type which needs to be standard layout (need to be able to use 'offsetof')