diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-02-25 19:23:56 -0500 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-02-25 19:23:56 -0500 |
| commit | 230c0e80dfcd44870bec3254c399db430f6e1d98 (patch) | |
| tree | 745ec3b082adc222050b4d48a416d7a969dd148d /tools/test-js-optimizer-regs.js | |
| parent | 5a99d2567e76f257309cfd225876f3a5402e5f46 (diff) | |
| parent | 9d4ef477a511ae4136c2d63e0150a4768cbd53ea (diff) | |
Merge branch 'incoming'
Conflicts:
AUTHORS
Diffstat (limited to 'tools/test-js-optimizer-regs.js')
| -rw-r--r-- | tools/test-js-optimizer-regs.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/test-js-optimizer-regs.js b/tools/test-js-optimizer-regs.js index 4802afa3..3013e518 100644 --- a/tools/test-js-optimizer-regs.js +++ b/tools/test-js-optimizer-regs.js @@ -230,4 +230,8 @@ function switchey(x) { var aaa = x+2; pp(aaa); } -// EMSCRIPTEN_GENERATED_FUNCTIONS: ["test", "primes", "atomic", "fcntl_open", "ex", "switchey"] +function __ZN14NetworkAddressC1EPKcti($this) { + __ZN14NetworkAddressC2EPKcti($this); + return; +} +// EMSCRIPTEN_GENERATED_FUNCTIONS: ["test", "primes", "atomic", "fcntl_open", "ex", "switchey", "__ZN14NetworkAddressC1EPKcti"] |