aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjinsuck <jkim@imvu.com>2012-11-30 14:38:54 -0800
committerJukka Jylänki <jujjyl@gmail.com>2013-04-12 14:22:14 +0300
commit026a4d49e496339c0f31b79ca3b399c53dac5f7f (patch)
tree663b96b8fa49d7a44e3ab6ac48f540516174daf4
parent73d2de4105fd8f7200fe42e868e53fe2378fab83 (diff)
support creating val with null (needed for sending null parameter to a
WebGL function)
-rw-r--r--src/embind/emval.js4
-rw-r--r--system/include/emscripten/val.h5
2 files changed, 9 insertions, 0 deletions
diff --git a/src/embind/emval.js b/src/embind/emval.js
index 65becfa3..e8ee6baf 100644
--- a/src/embind/emval.js
+++ b/src/embind/emval.js
@@ -45,6 +45,10 @@ function __emval_new_object() {
return __emval_register({});
}
+function __emval_new_null() {
+ return __emval_register(null);
+}
+
function __emval_new_long(value) {
return __emval_register(value);
}
diff --git a/system/include/emscripten/val.h b/system/include/emscripten/val.h
index 8db052e8..e2d35382 100644
--- a/system/include/emscripten/val.h
+++ b/system/include/emscripten/val.h
@@ -12,6 +12,7 @@ namespace emscripten {
void _emval_incref(EM_VAL value);
void _emval_decref(EM_VAL value);
EM_VAL _emval_new_object();
+ EM_VAL _emval_new_null();
EM_VAL _emval_new_long(long value);
EM_VAL _emval_new_cstring(const char* str);
bool _emval_has_property(EM_VAL object, const char* key);
@@ -48,6 +49,10 @@ namespace emscripten {
return val(internal::_emval_new_object());
};
+ static val null() {
+ return val(internal::_emval_new_null());
+ };
+
static val take_ownership(internal::EM_VAL e) {
return val(e);
}