From: William F. <wsf...@us...> - 2005-04-01 19:43:57
|
Update of /cvsroot/swig/SWIG/Source/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5716/Source/Modules Modified Files: lang.cxx main.cxx python.cxx swigmod.h Log Message: template ext mode on for all languages, not just Python now Index: swigmod.h =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Modules/swigmod.h,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** swigmod.h 2 Mar 2005 17:51:58 -0000 1.36 --- swigmod.h 1 Apr 2005 19:43:47 -0000 1.37 *************** *** 351,355 **** void Wrapper_director_mode_set(int); void Wrapper_director_protected_mode_set(int); - void Wrapper_template_extmode_set(int); void clean_overloaded(Node *n); --- 351,354 ---- Index: main.cxx =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Modules/main.cxx,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** main.cxx 17 Mar 2005 06:02:29 -0000 1.54 --- main.cxx 1 Apr 2005 19:43:46 -0000 1.55 *************** *** 672,679 **** Wrapper_director_protected_mode_set(0); - /* Turn off template extmode */ - Wrapper_template_extmode_set(0); - - // Check for SWIG_LIB environment variable --- 672,675 ---- Index: python.cxx =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** python.cxx 29 Mar 2005 20:52:52 -0000 1.92 --- python.cxx 1 Apr 2005 19:43:46 -0000 1.93 *************** *** 108,116 **** SWIG_library_directory("python"); - - - /* Turn on template extmode */ - Wrapper_template_extmode_set(1); - for (int i = 1; i < argc; i++) { if (argv[i]) { --- 108,111 ---- Index: lang.cxx =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Modules/lang.cxx,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** lang.cxx 14 Mar 2005 23:32:30 -0000 1.106 --- lang.cxx 1 Apr 2005 19:43:44 -0000 1.107 *************** *** 21,25 **** static int director_mode = 0; /* set to 0 on default */ static int director_protected_mode = 0; /* set to 0 on default */ - static int template_extmode = 0; /* set to 0 on default */ /* Set director_protected_mode */ --- 21,24 ---- *************** *** 32,39 **** } - void Wrapper_template_extmode_set(int flag) { - template_extmode = flag; - } - extern "C" { int Swig_director_mode() --- 31,34 ---- *************** *** 46,54 **** return director_protected_mode; } - - int Swig_template_extmode() - { - return template_extmode; - } } --- 41,44 ---- *************** *** 2586,2590 **** Delete(prefix); } ! if (n && (Getattr(n,"feature:ignore"))) { n = 0; } --- 2576,2580 ---- Delete(prefix); } ! if (n && (Getattr(n,"feature:ignore") || Getattr(n,"feature:onlychildren"))) { n = 0; } |