diff options
| author | ng420 <nish.gupta01@gmail.com> | 2016-08-15 20:43:31 +0100 |
|---|---|---|
| committer | ng420 <nish.gupta01@gmail.com> | 2016-08-15 20:43:31 +0100 |
| commit | dbe7630278aee8a0075618fbdb95a675d86d894c (patch) | |
| tree | f936c3ebde7dfad2786e1adaafa5cdd9d8854c4b | |
| parent | 876c2b28cde36885a0f05769613068a955f4d482 (diff) | |
| download | swig-dbe7630278aee8a0075618fbdb95a675d86d894c.tar.gz | |
Small fix and more passing test cases
| -rw-r--r-- | Examples/test-suite/hhvm/Makefile.in | 8 | ||||
| -rw-r--r-- | Source/Modules/hhvm.cxx | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/Examples/test-suite/hhvm/Makefile.in b/Examples/test-suite/hhvm/Makefile.in index 330837229..bd614f55d 100644 --- a/Examples/test-suite/hhvm/Makefile.in +++ b/Examples/test-suite/hhvm/Makefile.in @@ -12,13 +12,11 @@ OBJEXT = @OBJEXT@ SO = @SO@ FAILING_C_TESTS += \ - enums \ nested \ nested_extend_c \ nested_structs \ overload_extend2 \ overload_extend_c \ - typedef_struct \ typemap_subst \ FAILING_CPP_TESTS = \ @@ -33,10 +31,8 @@ FAILING_CPP_TESTS = \ contract \ cpp_basic \ default_args \ - default_constructor \ default_target \ defvalue_constructor \ - director_abstract \ director_basic \ director_nspace \ director_overload \ @@ -46,7 +42,6 @@ FAILING_CPP_TESTS = \ extend_placement \ features \ friends \ - friends_template \ ignore_parameter \ ignore_template_constructor \ kwargs_feature \ @@ -84,13 +79,10 @@ FAILING_CPP_TESTS = \ overload_template_fast \ pointer_reference \ primitive_ref \ - redefined \ - rename_scope \ return_const_value \ sizet \ smart_pointer_const_overload \ smart_pointer_inherit \ - smart_pointer_member \ smart_pointer_template_defaults_overload \ special_variable_macros \ special_variables \ diff --git a/Source/Modules/hhvm.cxx b/Source/Modules/hhvm.cxx index 7dfcff920..7aa901b2e 100644 --- a/Source/Modules/hhvm.cxx +++ b/Source/Modules/hhvm.cxx @@ -407,7 +407,7 @@ public: Parm *p = parms; // Skip the class pointer - if (!is_constructor && !staticmethodwrapper && !is_static && in_class) { + if (!is_constructor && !staticmethodwrapper && !is_static && is_member) { p = nextSibling(p); } @@ -454,7 +454,7 @@ public: Printf(f_link, ") {\n"); Printf(f_phpcode, ";\n\n"); - if (in_class && !staticmethodwrapper && !is_static) { + if (is_member && !staticmethodwrapper && !is_static) { Printf(f_link, " auto data = Object(this_);\n", classname); if (!is_constructor) { Replaceall(call_parms, "arg1", "data"); |