aboutsummaryrefslogtreecommitdiff
path: root/tests/embind/embind_test.cpp
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-04-29 15:29:48 -0700
committerAlon Zakai <alonzakai@gmail.com>2014-04-29 15:29:48 -0700
commitd3cf5d84ecfd5218b6f570860b0a92c7eb1be0eb (patch)
treebb26cbb538250aa6d65e9cedea447a9c731865f5 /tests/embind/embind_test.cpp
parentd5cf59ac87b14eee47e229fe0543c8faa27a2ff4 (diff)
parent6c1b114fa5078dcac3f6617a6f890f0106fcf090 (diff)
Merge pull request #2326 from polymeris/incoming
Bind std::basic_string<unsigned char> to js strings based on 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 1b835751..5a83903a 100644
--- a/tests/embind/embind_test.cpp
+++ b/tests/embind/embind_test.cpp
@@ -109,6 +109,10 @@ std::string emval_test_take_and_return_std_string_const_ref(const std::string& s
return str;
}
+std::basic_string<unsigned char> emval_test_take_and_return_std_basic_string_unsigned_char(std::basic_string<unsigned char> str) {
+ return str;
+}
+
std::wstring take_and_return_std_wstring(std::wstring str) {
return str;
}
@@ -1446,6 +1450,7 @@ EMSCRIPTEN_BINDINGS(tests) {
//function("emval_test_take_and_return_const_char_star", &emval_test_take_and_return_const_char_star);
function("emval_test_take_and_return_std_string", &emval_test_take_and_return_std_string);
function("emval_test_take_and_return_std_string_const_ref", &emval_test_take_and_return_std_string_const_ref);
+ function("emval_test_take_and_return_std_basic_string_unsigned_char", &emval_test_take_and_return_std_basic_string_unsigned_char);
function("take_and_return_std_wstring", &take_and_return_std_wstring);
//function("emval_test_take_and_return_CustomStruct", &emval_test_take_and_return_CustomStruct);