From 7f2a84961796e90afad5fd3684ca5ce229d1c6c1 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 20 Sep 2006 11:00:51 +0000 Subject: [PATCH] Revert the "automatic -noproxy for C code" change (for now at least) - the testsuite contains examples with proxy classes for C code, so it's not as obviously correct a change as I had thought. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9307 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 5 ----- Source/Modules/php4.cxx | 8 +++----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 5e93b2d17..8cdc70680 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -14,11 +14,6 @@ Version 1.3.30 (in progress) can no longer pass a number without explicitly converting it to a string in PHP using: (string)x -09/20/2006: olly - [php] Previously -noproxy was required when wrapping some C code - to avoid SWIG generating new_XXX methods. Now proxy classes are - only ever enabled when wrapping C++ code. - 09/18/2006: mgossage [ALL] fix on swiginit.swg, has been reported to crash on several test cases found and fixed problem in imports under python (mingw) diff --git a/Source/Modules/php4.cxx b/Source/Modules/php4.cxx index 3cb7c96c6..ab789f4e0 100644 --- a/Source/Modules/php4.cxx +++ b/Source/Modules/php4.cxx @@ -124,7 +124,7 @@ static Hash *shadow_set_vars; static int native_constructor=0; static Hash *zend_types = 0; -static int shadow = 0; // Default set in PHP::main : 1 for C++; 0 for C. +static int shadow = 1; static bool class_has_ctor = false; static String * wrapping_member_constant = NULL; @@ -240,14 +240,12 @@ public: /* ------------------------------------------------------------ * main() * ------------------------------------------------------------ */ - + virtual void main(int argc, char *argv[]) { int i; SWIG_library_directory("php4"); SWIG_config_cppext("cpp"); - // Default to generating shadow classes for C++. - shadow = CPlusPlus; - + for(i = 1; i < argc; i++) { if (argv[i]) { if(strcmp(argv[i], "-phpfull") == 0) {