aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDominic Wong <dombot@gmail.com>2012-11-30 15:16:00 +0800
committerDominic Wong <dombot@gmail.com>2012-11-30 15:16:00 +0800
commite0c208c49395be56aefd37247a8852ef942703c8 (patch)
treefddf57640a6df256fbe73944be861dfa7fcbe101 /tests
parent64b3836a68c51bfe5823bbd0a82050b4a43536ca (diff)
Fixed embind for non-void non-const class methods (with test).
Diffstat (limited to 'tests')
-rw-r--r--tests/embind/embind_test.cpp5
-rw-r--r--tests/embind/embind_test.js2
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/embind/embind_test.cpp b/tests/embind/embind_test.cpp
index e7b4d985..dc052d1a 100644
--- a/tests/embind/embind_test.cpp
+++ b/tests/embind/embind_test.cpp
@@ -96,6 +96,10 @@ public:
this->v = v;
}
+ int returnIntPlusFive( int x ) {
+ return x + 5;
+ }
+
static int some_class_method(int i) {
return i;
}
@@ -286,6 +290,7 @@ EMSCRIPTEN_BINDINGS(([]() {
.constructor<val>()
.method("getVal", &ValHolder::getVal)
.method("setVal", &ValHolder::setVal)
+ .method("returnIntPlusFive", &ValHolder::returnIntPlusFive)
.classmethod("some_class_method", &ValHolder::some_class_method)
;
function("emval_test_return_ValHolder", &emval_test_return_ValHolder);
diff --git a/tests/embind/embind_test.js b/tests/embind/embind_test.js
index e01f0236..8c61553b 100644
--- a/tests/embind/embind_test.js
+++ b/tests/embind/embind_test.js
@@ -137,6 +137,8 @@ module({
c.setVal('1234');
assert.equal('1234', c.getVal());
+ assert.equal(1239, c.returnIntPlusFive(1234));
+
c.delete();
assert.equal(0, cm.count_emval_handles());
},