aboutsummaryrefslogtreecommitdiff
path: root/tests/embind/embind_test.cpp
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-12-07 14:50:07 -0800
committerAlon Zakai <alonzakai@gmail.com>2012-12-07 14:50:07 -0800
commit33ca644b5b3e78af1998db308efda6a57c42bd28 (patch)
treefc35b9a14272c00543d1f7edafa752a61cb6de6a /tests/embind/embind_test.cpp
parent19e25f10d8808a5f27e5fea0df15de3f326a31b5 (diff)
parentab399ca532fb1deb7607f6cc2feb01186d75ec2b (diff)
Merge branch 'incoming'
Diffstat (limited to 'tests/embind/embind_test.cpp')
-rw-r--r--tests/embind/embind_test.cpp5
1 files changed, 5 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);