aboutsummaryrefslogtreecommitdiff
path: root/system/include
diff options
context:
space:
mode:
authorChad Austin <caustin@gmail.com>2013-08-02 00:27:55 -0700
committerBruce Mitchener <bruce.mitchener@gmail.com>2014-02-04 16:14:46 +0700
commit04b624f10d7f040e5e9551e9c956c4b0ca7c66b0 (patch)
tree9e30a4e4647a821220e03ee284e1a1afae18fefc /system/include
parenta63c4f58b898f2a76c19291cb603de88ef171028 (diff)
Remove an assertion that prevents mergefunc from doing its magic.
Diffstat (limited to 'system/include')
-rw-r--r--system/include/emscripten/bind.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h
index 403d8084..b9da5304 100644
--- a/system/include/emscripten/bind.h
+++ b/system/include/emscripten/bind.h
@@ -794,7 +794,6 @@ namespace emscripten {
// NOTE: this returns the class type, not the pointer type
template<typename T>
inline TYPEID getActualType(T* ptr) {
- assert(ptr);
return reinterpret_cast<TYPEID>(&typeid(*ptr));
};
}