finishing change from 'static' to 'SWIGINTERN'

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7001 626c5289-ae23-0410-ae9c-e8d60b6d4f22

5 files changed, 27 insertions, 20 deletions

diff --git a/Lib/python/defarg.swg b/Lib/python/defarg.swg
index 83f6d5516..8d10aec69 100644
--- a/Lib/python/defarg.swg
+++ b/Lib/python/defarg.swg
@@ -20,7 +20,7 @@
    An ugly hack, but it works.
 */
 
-static PyObject *swig_call_defargs(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *swig_call_defargs(PyObject *self, PyObject *args) {
 	PyObject *func;
 	PyObject *parms;
 
diff --git a/Lib/python/director_h.swg b/Lib/python/director_h.swg
index 485211758..9c522cd28 100644
--- a/Lib/python/director_h.swg
+++ b/Lib/python/director_h.swg
@@ -38,16 +38,16 @@
 #include <map>
 namespace Swig {
   class Director;
-  static std::map<void*,Director*>& get_rtdir_map() {
+  SWIGINTERN std::map<void*,Director*>& get_rtdir_map() {
     static std::map<void*,Director*> rtdir_map;
     return rtdir_map;
   }
 
-  static inline void set_rtdir(void *vptr, Director *rtdir) {
+  SWIGINTERNINLINE void set_rtdir(void *vptr, Director *rtdir) {
     get_rtdir_map()[vptr] = rtdir;
   }
 
-  static inline Director *get_rtdir(void *vptr) {
+  SWIGINTERNINLINE Director *get_rtdir(void *vptr) {
     std::map<void*,Director*>::const_iterator pos = get_rtdir_map().find(vptr);
     Director *rtdir = (pos != get_rtdir_map().end()) ? pos->second : 0;
     return rtdir;
diff --git a/Lib/python/pyinit.swg b/Lib/python/pyinit.swg
index 5a0e41bb8..56f9e6eea 100644
--- a/Lib/python/pyinit.swg
+++ b/Lib/python/pyinit.swg
@@ -31,13 +31,13 @@ typedef struct swig_varlinkobject {
   swig_globalvar *vars;
 } swig_varlinkobject;
 
-static PyObject *
+SWIGINTERN PyObject *
 swig_varlink_repr(swig_varlinkobject *v) {
   v = v;
   return PyString_FromString("<Swig global variables>");
 }
 
-static int
+SWIGINTERN int
 swig_varlink_print(swig_varlinkobject *v, FILE *fp, int flags) {
   swig_globalvar  *var;
   flags = flags;
@@ -50,7 +50,7 @@ swig_varlink_print(swig_varlinkobject *v, FILE *fp, int flags) {
   return 0;
 }
 
-static PyObject *
+SWIGINTERN PyObject *
 swig_varlink_getattr(swig_varlinkobject *v, char *n) {
   swig_globalvar *var = v->vars;
   while (var) {
@@ -63,7 +63,7 @@ swig_varlink_getattr(swig_varlinkobject *v, char *n) {
   return NULL;
 }
 
-static int
+SWIGINTERN int
 swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
   swig_globalvar *var = v->vars;
   while (var) {
@@ -76,7 +76,7 @@ swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
   return 1;
 }
 
-static PyTypeObject varlinktype = {
+SWIGINTERN PyTypeObject varlinktype = {
   PyObject_HEAD_INIT(0)              
   0,                                  /* Number of items in variable part (ob_size) */
   (char *)"swigvarlink",              /* Type name (tp_name) */
@@ -119,7 +119,7 @@ static PyTypeObject varlinktype = {
 };
 
 /* Create a variable linking object for use later */
-static PyObject *
+SWIGINTERN PyObject *
 SWIG_Python_newvarlink(void) {
   swig_varlinkobject *result = 0;
   result = PyMem_NEW(swig_varlinkobject,1);
@@ -131,7 +131,7 @@ SWIG_Python_newvarlink(void) {
   return ((PyObject*) result);
 }
 
-static SWIGUNUSED void 
+SWIGINTERN void 
 SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
   swig_varlinkobject *v;
   swig_globalvar *gv;
@@ -150,7 +150,7 @@ SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int
  * ----------------------------------------------------------------------------- */
 
 /* Install Constants */
-static void
+SWIGINTERN void
 SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
   PyObject *obj = 0;
   size_t i;
@@ -191,7 +191,7 @@ SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
 /* Fix SwigMethods to carry the callback ptrs when needed */
 /* -----------------------------------------------------------------------------*/
 
-static void
+SWIGINTERN void
 SWIG_Python_FixMethods(PyMethodDef *methods,
 		       swig_const_info *const_table,
 		       swig_type_info **types,
@@ -236,7 +236,7 @@ SWIG_Python_FixMethods(PyMethodDef *methods,
 #if PY_MAJOR_VERSION < 2
 /* PyModule_AddObject function was introduced in Python 2.0.  The following function
 is copied out of Python/modsupport.c in python version 2.3.4 */
-static int
+SWIGINTERN int
 PyModule_AddObject(PyObject *m, char *name, PyObject *o)
 {
   PyObject *dict;
diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg
index d43aef007..b69a5159b 100644
--- a/Lib/python/pyrun.swg
+++ b/Lib/python/pyrun.swg
@@ -748,7 +748,7 @@ SWIG_Python_GetModule() {
   return (swig_module_info *) type_pointer;
 }
 
-static void
+SWIGINTERN void
 SWIG_Python_SetModule(swig_module_info *swig_module) {
   static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */
 
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 77676d716..d4dfd586a 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1404,12 +1404,19 @@ public:
     */
      
     /* Emit the function call */
-    Printf(f->code, "try {\n");
+    if (directorsEnabled()) {
+      Printf(f->code, "try {\n");
+    }
+    
     emit_action(n,f);
-    Printf(f->code, "} catch (Swig::DirectorException& e) {\n");
-    Printf(f->code, "  SWIG_Python_AddErrMesg(e.getMessage(), 1);\n");
-    Printf(f->code, "  SWIG_fail;\n");
-    Printf(f->code, "}\n");
+
+    if (directorsEnabled()) {
+      Printf(f->code, "} catch (Swig::DirectorException& e) {\n");
+      Printf(f->code, "  SWIG_Python_AddErrMesg(e.getMessage(), 1);\n");
+      Printf(f->code, "  SWIG_fail;\n");
+      Printf(f->code, "}\n");
+    }
+    
 
     /* This part below still needs cleanup */