aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-09-25 16:15:15 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-09-25 16:15:15 -0700
commit56c19a74e44458003c2470e08055e7fae23fc1c0 (patch)
treeab68e8db8c27b2c4694fa92858ad2426fce161ee
parentac36f1a7237e1e804d7f07bed4226a3f5a3320d8 (diff)
parentb84fcaf11c9d484ef04e2752955361ff5e4d6148 (diff)
Merge pull request #587 from imvu/rtti-pull-request
add support for bool rtti
-rw-r--r--AUTHORS2
-rw-r--r--src/library.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index c78ee543..a46d90d9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,7 +26,7 @@ a license to everyone to use it as detailed in LICENSE.)
* Jon Bardin <diclophis@gmail.com>
* Jukka Jylänki <jujjyl@gmail.com>
* Aleksander Guryanov <caiiiycuk@gmail.com>
-* Chad Austin <chad@chadaustin.me>
+* Chad Austin <chad@chadaustin.me> (copyright owned by IMVU)
* nandhp <nandhp@gmail.com>
* YeZhongWen <linghuye2.0@gmail.com>
* Xingxing Pan <forandom@gmail.com>
diff --git a/src/library.js b/src/library.js
index 1c150bc9..3531db97 100644
--- a/src/library.js
+++ b/src/library.js
@@ -4850,6 +4850,7 @@ LibraryManager.library = {
// RTTI hacks for exception handling, defining type_infos for common types.
// The values are dummies. We simply use the addresses of these statically
// allocated variables as unique identifiers.
+ _ZTIb: [0], // bool
_ZTIi: [0], // int
_ZTIj: [0], // unsigned int
_ZTIl: [0], // long
@@ -4863,7 +4864,7 @@ LibraryManager.library = {
_ZTIa: [0], // signed char
_ZTIh: [0], // unsigned char
_ZTIs: [0], // short
- _ZTIt: [0], // signed short
+ _ZTIt: [0], // unsigned short
_ZTIv: [0], // void
_ZTIPv: [0], // void*