aboutsummaryrefslogtreecommitdiff
path: root/system/lib/embind/bind.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 /system/lib/embind/bind.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 'system/lib/embind/bind.cpp')
-rw-r--r--system/lib/embind/bind.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/system/lib/embind/bind.cpp b/system/lib/embind/bind.cpp
index 37918050..16c24a91 100644
--- a/system/lib/embind/bind.cpp
+++ b/system/lib/embind/bind.cpp
@@ -78,6 +78,7 @@ EMSCRIPTEN_BINDINGS(native_and_builtin_types) {
register_float<double>("double");
_embind_register_std_string(TypeID<std::string>::get(), "std::string");
+ _embind_register_std_string(TypeID<std::basic_string<unsigned char> >::get(), "std::basic_string<unsigned char>");
_embind_register_std_wstring(TypeID<std::wstring>::get(), sizeof(wchar_t), "std::wstring");
_embind_register_emval(TypeID<val>::get(), "emscripten::val");
_embind_register_memory_view(TypeID<memory_view>::get(), "emscripten::memory_view");