Simplify upcasting/downcasting, allow multiple smart pointer types per class, and use the same ClassHandle prototype so class handles and smart pointer handles share implementations for .clone() and .delete()

1 files changed, 3 insertions, 3 deletions

diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h
index cd208d37..a1b2a015 100755
--- a/system/include/emscripten/bind.h
+++ b/system/include/emscripten/bind.h
@@ -117,7 +117,6 @@ namespace emscripten {
                 GenericFunction getActualType,
                 GenericFunction upcast,
                 GenericFunction downcast,
-                bool isPolymorphic,
                 const char* className,
                 GenericFunction destructor);
 
@@ -650,9 +649,11 @@ namespace emscripten {
             }
         };
 
+        // NOTE: this returns the class type, not the pointer type
         template<typename T>
         inline TYPEID getActualType(T* ptr) {
-            return reinterpret_cast<TYPEID>(&typeid(ptr));
+            assert(ptr);
+            return reinterpret_cast<TYPEID>(&typeid(*ptr));
         };
     }
 
@@ -720,7 +721,6 @@ namespace emscripten {
                 reinterpret_cast<GenericFunction>(&getActualType<ClassType>),
                 BaseSpecifier::template getUpcaster<ClassType>(),
                 BaseSpecifier::template getDowncaster<ClassType>(),
-                std::is_polymorphic<ClassType>::value, // TODO: may not be necessary
                 name,
                 reinterpret_cast<GenericFunction>(&raw_destructor<ClassType>));
         }