[Swig-cvs] SWIG/Lib/python director_h.swg,1.2,1.3 file.i,1.2,1.3 pyapi.swg,1.10,1.11 pycomplex.swg,1.4,1.5 pycontainer.swg,1.5,1.6 pyfragments.swg,1.2,1.3 pyinit.swg,1.11,1.12 pyprimtypes.swg,1.21,1.22 pyptrtypes.swg,1.13,1.14 pystdcommon.swg,1.3,1.4 pystrings.swg,1.14,1.15 pyvaltypes.swg,1.17,1.18 pywstrings.swg,1.10,1.11 std_basic_string.i,1.6,1.7 std_string.i,1.22,1.23 std_wstring.i,1.9,1.10

[Marcelo M. <mar...@us...>]

Update of /cvsroot/swig/SWIG/Lib/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3605/python

Modified Files:
	director_h.swg file.i pyapi.swg pycomplex.swg pycontainer.swg 
	pyfragments.swg pyinit.swg pyprimtypes.swg pyptrtypes.swg 
	pystdcommon.swg pystrings.swg pyvaltypes.swg pywstrings.swg 
	std_basic_string.i std_string.i std_wstring.i 
Log Message:
More fix for warnings, and add some of the ideas of the Bill's 'labels' patch

Index: pyfragments.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pyfragments.swg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pyfragments.swg	2 Oct 2004 20:15:46 -0000	1.2
--- pyfragments.swg	24 Feb 2005 23:48:19 -0000	1.3
***************
*** 8,12 ****
    
    %fragment(SWIG_AsVal_frag(int),"header") {
!    SWIGINTERNSHORT int
     SWIG_AsVal(int)(PyObject *obj, int *val)
     { 
--- 8,12 ----
    
    %fragment(SWIG_AsVal_frag(int),"header") {
!    SWIGINTERNINLINE int
     SWIG_AsVal(int)(PyObject *obj, int *val)
     { 

Index: pycomplex.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pycomplex.swg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pycomplex.swg	10 Oct 2004 06:42:14 -0000	1.4
--- pycomplex.swg	24 Feb 2005 23:48:19 -0000	1.5
***************
*** 12,16 ****
  %fragment(SWIG_From_frag(Type),"header")
  %{
! SWIGINTERNSHORT PyObject*
    SWIG_From(Type)(SWIG_cplusplus(const Type&, Type) c)
  {
--- 12,16 ----
  %fragment(SWIG_From_frag(Type),"header")
  %{
! SWIGINTERNINLINE PyObject*
    SWIG_From(Type)(SWIG_cplusplus(const Type&, Type) c)
  {

Index: pystrings.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pystrings.swg,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pystrings.swg	11 Dec 2004 08:30:39 -0000	1.14
--- pystrings.swg	24 Feb 2005 23:48:19 -0000	1.15
***************
*** 38,42 ****
  %fragment("SWIG_AsCharPtr","header",
  	  fragment="SWIG_AsCharPtrAndSize") {
! SWIGINTERNSHORT int
  SWIG_AsCharPtr(PyObject *obj, char **val)
  {
--- 38,42 ----
  %fragment("SWIG_AsCharPtr","header",
  	  fragment="SWIG_AsCharPtrAndSize") {
! SWIGINTERNINLINE int
  SWIG_AsCharPtr(PyObject *obj, char **val)
  {
***************
*** 135,139 ****
  
  %fragment("SWIG_FromCharArray","header") {
! SWIGINTERNSHORT PyObject *
  SWIG_FromCharArray(const char* carray, size_t size)
  {
--- 135,139 ----
  
  %fragment("SWIG_FromCharArray","header") {
! SWIGINTERNINLINE PyObject *
  SWIG_FromCharArray(const char* carray, size_t size)
  {

Index: pyprimtypes.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pyprimtypes.swg,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** pyprimtypes.swg	1 Dec 2004 12:02:46 -0000	1.21
--- pyprimtypes.swg	24 Feb 2005 23:48:19 -0000	1.22
***************
*** 104,108 ****
  %fragment("SWIG_CheckUnsignedLongInRange","header",
  	  fragment="<limits.h>") {
! SWIGINTERNSHORT int
    SWIG_CheckUnsignedLongInRange(unsigned long value,
  				unsigned long max_value,
--- 104,108 ----
  %fragment("SWIG_CheckUnsignedLongInRange","header",
  	  fragment="<limits.h>") {
! SWIGINTERNINLINE int
    SWIG_CheckUnsignedLongInRange(unsigned long value,
  				unsigned long max_value,
***************
*** 179,183 ****
  %fragment(SWIG_From_frag(long long),"header",
  	  fragment="<limits.h>") {
! SWIGINTERNSHORT PyObject* 
    SWIG_From(long long)(long long value)
  {
--- 179,183 ----
  %fragment(SWIG_From_frag(long long),"header",
  	  fragment="<limits.h>") {
! SWIGINTERNINLINE PyObject* 
    SWIG_From(long long)(long long value)
  {
***************
*** 191,195 ****
  %fragment(SWIG_From_frag(unsigned long long),"header",
  	  fragment="<limits.h>") {
! SWIGINTERNSHORT PyObject* 
    SWIG_From(unsigned long long)(unsigned long long value)
  {
--- 191,195 ----
  %fragment(SWIG_From_frag(unsigned long long),"header",
  	  fragment="<limits.h>") {
! SWIGINTERNINLINE PyObject* 
    SWIG_From(unsigned long long)(unsigned long long value)
  {
***************
*** 255,259 ****
  
  %fragment(SWIG_From_frag(unsigned long),"header") {
! SWIGINTERNSHORT PyObject* 
    SWIG_From(unsigned long)(unsigned long value)
  {
--- 255,259 ----
  
  %fragment(SWIG_From_frag(unsigned long),"header") {
! SWIGINTERNINLINE PyObject* 
    SWIG_From(unsigned long)(unsigned long value)
  {
***************
*** 341,345 ****
  }
  %#else
! SWIGINTERNSHORT int
    SWIG_AsVal(int)(PyObject *obj, int *val)
  {
--- 341,345 ----
  }
  %#else
! SWIGINTERNINLINE int
    SWIG_AsVal(int)(PyObject *obj, int *val)
  {
***************
*** 372,376 ****
  }
  %#else
! SWIGINTERNSHORT unsigned int
    SWIG_AsVal(unsigned int)(PyObject *obj, unsigned int *val)
  {
--- 372,376 ----
  }
  %#else
! SWIGINTERNINLINE unsigned int
    SWIG_AsVal(unsigned int)(PyObject *obj, unsigned int *val)
  {
***************
*** 492,496 ****
  
  %fragment(SWIG_From_frag(char),"header") {
! SWIGINTERNSHORT PyObject*
    SWIG_From(char)(char c) 
  { 
--- 492,496 ----
  
  %fragment(SWIG_From_frag(char),"header") {
! SWIGINTERNINLINE PyObject*
    SWIG_From(char)(char c) 
  { 
***************
*** 523,527 ****
  
  %fragment(SWIG_From_frag(wchar_t),"header") {
! SWIGINTERNSHORT PyObject*
    SWIG_From(wchar_t)(wchar_t c) 
  { 
--- 523,527 ----
  
  %fragment(SWIG_From_frag(wchar_t),"header") {
! SWIGINTERNINLINE PyObject*
    SWIG_From(wchar_t)(wchar_t c) 
  { 
***************
*** 555,559 ****
  
  %fragment(SWIG_From_frag(bool),"header") {
! SWIGINTERNSHORT PyObject*
    SWIG_From(bool)(bool value)
  {
--- 555,559 ----
  
  %fragment(SWIG_From_frag(bool),"header") {
! SWIGINTERNINLINE PyObject*
    SWIG_From(bool)(bool value)
  {

Index: std_basic_string.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/std_basic_string.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** std_basic_string.i	18 Oct 2004 00:31:24 -0000	1.6
--- std_basic_string.i	24 Feb 2005 23:48:20 -0000	1.7
***************
*** 39,43 ****
  %fragment(SWIG_From_frag(std::basic_string<char>),"header",
  	  fragment="SWIG_FromCharArray") {
! SWIGINTERNSHORT PyObject*
    SWIG_From(std::basic_string<char>)(const std::string& s)
    {
--- 39,43 ----
  %fragment(SWIG_From_frag(std::basic_string<char>),"header",
  	  fragment="SWIG_FromCharArray") {
! SWIGINTERNINLINE PyObject*
    SWIG_From(std::basic_string<char>)(const std::string& s)
    {
***************
*** 81,85 ****
  %fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header",
  	  fragment="SWIG_FromWCharArray") {
! SWIGINTERNSHORT PyObject*
    SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s)
    {
--- 81,85 ----
  %fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header",
  	  fragment="SWIG_FromWCharArray") {
! SWIGINTERNINLINE PyObject*
    SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s)
    {

Index: pycontainer.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pycontainer.swg,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pycontainer.swg	10 Oct 2004 06:42:14 -0000	1.5
--- pycontainer.swg	24 Feb 2005 23:48:19 -0000	1.6
***************
*** 141,149 ****
        } catch (std::exception& e) {
  	char msg[1024];
! 	sprintf(msg,"in sequence element %d", _index);
  	if (!PyErr_Occurred()) {
  	  SWIG_type_error(swig::type_name<T>(), item);
  	}
  	SWIG_append_errmsg(msg);
  	throw;
        }
--- 141,150 ----
        } catch (std::exception& e) {
  	char msg[1024];
! 	sprintf(msg,"in sequence element %d ", _index);
  	if (!PyErr_Occurred()) {
  	  SWIG_type_error(swig::type_name<T>(), item);
  	}
  	SWIG_append_errmsg(msg);
+ 	SWIG_append_errmsg(e.what());
  	throw;
        }

Index: file.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/file.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** file.i	2 Oct 2004 20:15:46 -0000	1.2
--- file.i	24 Feb 2005 23:48:18 -0000	1.3
***************
*** 29,33 ****
  
  %fragment("SWIG_AsFilePtr","header",fragment="SWIG_AsValFilePtr") {
! SWIGINTERNSHORT FILE*
  SWIG_AsFilePtr(PyObject *obj) {
    FILE *val = 0;
--- 29,33 ----
  
  %fragment("SWIG_AsFilePtr","header",fragment="SWIG_AsValFilePtr") {
! SWIGINTERNINLINE FILE*
  SWIG_AsFilePtr(PyObject *obj) {
    FILE *val = 0;
***************
*** 38,42 ****
  
  %fragment("SWIG_CheckFilePtr","header",fragment="SWIG_AsValFilePtr") {
! SWIGINTERNSHORT int
  SWIG_CheckFilePtr(PyObject *obj) {
    return SWIG_AsValFilePtr(obj, (FILE **)(0));
--- 38,42 ----
  
  %fragment("SWIG_CheckFilePtr","header",fragment="SWIG_AsValFilePtr") {
! SWIGINTERNINLINE int
  SWIG_CheckFilePtr(PyObject *obj) {
    return SWIG_AsValFilePtr(obj, (FILE **)(0));

Index: director_h.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/director_h.swg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** director_h.swg	16 Dec 2004 10:40:01 -0000	1.2
--- director_h.swg	24 Feb 2005 23:48:18 -0000	1.3
***************
*** 26,51 ****
    /* base class for director exceptions */
    class DirectorException {
!     protected:
!       std::string swig_msg;
!     public:
!       DirectorException(const char* msg="") {
!       }
!       const char *getMessage() const { 
!         return swig_msg.c_str(); 
!       }
!     virtual ~DirectorException();
!     
    };
  
    /* type mismatch in the return value from a python method call */
    class DirectorTypeMismatchException : public Swig::DirectorException {
!     public:
!       DirectorTypeMismatchException(const char* msg="") {
! 	if (!PyErr_Occurred()) {
! 	  swig_msg = "Swig director type mismatch: ";
! 	  swig_msg += msg;
! 	  PyErr_SetString(PyExc_TypeError, getMessage());
! 	}
        }
    };
  
--- 26,52 ----
    /* base class for director exceptions */
    class DirectorException {
!   protected:
!     std::string swig_msg;
!   public:
!     DirectorException(const char* /* msg */ ="") {
!     }
! 
!     const char *getMessage() const { 
!       return swig_msg.c_str(); 
!     }
! 
!     virtual ~DirectorException();    
    };
  
    /* type mismatch in the return value from a python method call */
    class DirectorTypeMismatchException : public Swig::DirectorException {
!   public:
!     DirectorTypeMismatchException(const char* msg="") {
!       if (!PyErr_Occurred()) {
! 	swig_msg = "Swig director type mismatch: ";
! 	swig_msg += msg;
! 	PyErr_SetString(PyExc_TypeError, getMessage());
        }
+     }
    };
  
***************
*** 74,187 ****
    /* director base class */
    class Director {
!     private:
!       /* pointer to the wrapped python object */
!       PyObject* swig_self;
!       /* flag indicating whether the object is owned by python or c++ */
!       mutable bool swig_disown_flag;
!       /* shared flag for breaking recursive director calls */
!       static bool swig_up;
  
  #ifdef __PTHREAD__
!       /* locks for sharing the swig_up flag in a threaded environment */
!       static pthread_mutex_t swig_mutex_up;
!       static bool swig_mutex_active;
!       static pthread_t swig_mutex_thread;
  #endif
  
!       /* decrement the reference count of the wrapped python object */
!       void swig_decref() const { 
!         if (swig_disown_flag) {
!           Py_DECREF(swig_self); 
!         }
        }
  
!       /* reset the swig_up flag once the routing direction has been determined */
  #ifdef __PTHREAD__
!       void swig_clear_up() const { 
!         Swig::Director::swig_up = false; 
!         Swig::Director::swig_mutex_active = false;
!         pthread_mutex_unlock(&swig_mutex_up);
!       }
  #else
!       void swig_clear_up() const { 
!         Swig::Director::swig_up = false; 
!       }
  #endif
  
!     public:
!       /* wrap a python object, optionally taking ownership */
!       Director(PyObject* self) : swig_self(self), swig_disown_flag(false) {
!         swig_incref();
!       }
  
!       /* discard our reference at destruction */
!       virtual ~Director();
  
!       /* return a pointer to the wrapped python object */
!       PyObject *swig_get_self() const { 
!         return swig_self; 
!       }
  
!       /* get the swig_up flag to determine if the method call should be routed
!        * to the c++ base class or through the wrapped python object
!        */
  #ifdef __PTHREAD__
!       bool swig_get_up() const { 
!         if (Swig::Director::swig_mutex_active) {
!           if (pthread_equal(Swig::Director::swig_mutex_thread, pthread_self())) {
!             bool up = swig_up;
!             swig_clear_up();
!             return up;
!           }
!         }
!         return 0;
        }
  #else 
!       bool swig_get_up() const { 
!         bool up = swig_up;
!         swig_up = false;
!         return up;
!       }
  #endif
  
!       /* set the swig_up flag if the next method call should be directed to
!        * the c++ base class rather than the wrapped python object
!        */
  #ifdef __PTHREAD__
!       void swig_set_up() const { 
!         pthread_mutex_lock(&Swig::Director::swig_mutex_up);
!         Swig::Director::swig_mutex_thread = pthread_self();
!         Swig::Director::swig_mutex_active = true;
!         Swig::Director::swig_up = true; 
!       }
  #else 
!       void swig_set_up() const { 
!         Swig::Director::swig_up = true; 
!       }
  #endif
  
!       /* acquire ownership of the wrapped python object (the sense of "disown"
!        * is from python) */
!       void swig_disown() const { 
!         if (!swig_disown_flag) { 
!           swig_disown_flag=true;
!           swig_incref(); 
!         } 
!       }
! 
!       /* increase the reference count of the wrapped python object */
!       void swig_incref() const { 
!         if (swig_disown_flag) {
!           Py_INCREF(swig_self); 
!         }
!       }
  
!       /* methods to implement pseudo protected director members */
!       virtual bool swig_get_inner(const char* name) const {
!         return true;
        }
  
!       virtual void swig_set_inner(const char* name, bool val) const {
!       }
    };
  
--- 75,188 ----
    /* director base class */
    class Director {
!   private:
!     /* pointer to the wrapped python object */
!     PyObject* swig_self;
!     /* flag indicating whether the object is owned by python or c++ */
!     mutable bool swig_disown_flag;
!     /* shared flag for breaking recursive director calls */
!     static bool swig_up;
  
  #ifdef __PTHREAD__
!     /* locks for sharing the swig_up flag in a threaded environment */
!     static pthread_mutex_t swig_mutex_up;
!     static bool swig_mutex_active;
!     static pthread_t swig_mutex_thread;
  #endif
  
!     /* decrement the reference count of the wrapped python object */
!     void swig_decref() const { 
!       if (swig_disown_flag) {
! 	Py_DECREF(swig_self); 
        }
+     }
  
!     /* reset the swig_up flag once the routing direction has been determined */
  #ifdef __PTHREAD__
!     void swig_clear_up() const { 
!       Swig::Director::swig_up = false; 
!       Swig::Director::swig_mutex_active = false;
!       pthread_mutex_unlock(&swig_mutex_up);
!     }
  #else
!     void swig_clear_up() const { 
!       Swig::Director::swig_up = false; 
!     }
  #endif
  
!   public:
!     /* wrap a python object, optionally taking ownership */
!     Director(PyObject* self) : swig_self(self), swig_disown_flag(false) {
!       swig_incref();
!     }
  
!     /* discard our reference at destruction */
!     virtual ~Director();
  
!     /* return a pointer to the wrapped python object */
!     PyObject *swig_get_self() const { 
!       return swig_self; 
!     }
  
!     /* get the swig_up flag to determine if the method call should be routed
!      * to the c++ base class or through the wrapped python object
!      */
  #ifdef __PTHREAD__
!     bool swig_get_up() const { 
!       if (Swig::Director::swig_mutex_active) {
! 	if (pthread_equal(Swig::Director::swig_mutex_thread, pthread_self())) {
! 	  bool up = swig_up;
! 	  swig_clear_up();
! 	  return up;
! 	}
        }
+       return 0;
+     }
  #else 
!     bool swig_get_up() const { 
!       bool up = swig_up;
!       swig_up = false;
!       return up;
!     }
  #endif
  
!     /* set the swig_up flag if the next method call should be directed to
!      * the c++ base class rather than the wrapped python object
!      */
  #ifdef __PTHREAD__
!     void swig_set_up() const { 
!       pthread_mutex_lock(&Swig::Director::swig_mutex_up);
!       Swig::Director::swig_mutex_thread = pthread_self();
!       Swig::Director::swig_mutex_active = true;
!       Swig::Director::swig_up = true; 
!     }
  #else 
!     void swig_set_up() const { 
!       Swig::Director::swig_up = true; 
!     }
  #endif
  
!     /* acquire ownership of the wrapped python object (the sense of "disown"
!      * is from python) */
!     void swig_disown() const { 
!       if (!swig_disown_flag) { 
! 	swig_disown_flag=true;
! 	swig_incref(); 
!       } 
!     }
  
!     /* increase the reference count of the wrapped python object */
!     void swig_incref() const { 
!       if (swig_disown_flag) {
! 	Py_INCREF(swig_self); 
        }
+     }
  
!     /* methods to implement pseudo protected director members */
!     virtual bool swig_get_inner(const char* /* name */) const {
!       return true;
!     }
!     
!     virtual void swig_set_inner(const char* /* name */, bool /* val */) const {
!     }
    };
  

Index: pyinit.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pyinit.swg,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pyinit.swg	22 Feb 2005 19:54:20 -0000	1.11
--- pyinit.swg	24 Feb 2005 23:48:19 -0000	1.12
***************
*** 132,136 ****
  }
  
! static void
  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
    swig_varlinkobject *v;
--- 132,136 ----
  }
  
! static SWIGUNUSED void 
  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
    swig_varlinkobject *v;

Index: pyvaltypes.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pyvaltypes.swg,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** pyvaltypes.swg	16 Dec 2004 10:40:01 -0000	1.17
--- pyvaltypes.swg	24 Feb 2005 23:48:19 -0000	1.18
***************
*** 128,132 ****
  %fragment(SWIG_As_frag(Type),"header",
  	  fragment=SWIG_AsVal_frag(Type)) %{
! SWIGINTERNSHORT Type
  SWIG_As(Type)(PyObject* obj)
  {
--- 128,132 ----
  %fragment(SWIG_As_frag(Type),"header",
  	  fragment=SWIG_AsVal_frag(Type)) %{
! SWIGINTERNINLINE Type
  SWIG_As(Type)(PyObject* obj)
  {
***************
*** 143,147 ****
  %fragment(SWIG_Check_frag(Type),"header",
  	  fragment=SWIG_AsVal_frag(Type)) %{  
! SWIGINTERNSHORT int
  SWIG_Check(Type)(PyObject* obj)
  {
--- 143,147 ----
  %fragment(SWIG_Check_frag(Type),"header",
  	  fragment=SWIG_AsVal_frag(Type)) %{  
! SWIGINTERNINLINE int
  SWIG_Check(Type)(PyObject* obj)
  {

Index: std_wstring.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/std_wstring.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** std_wstring.i	2 Nov 2004 17:04:31 -0000	1.9
--- std_wstring.i	24 Feb 2005 23:48:20 -0000	1.10
***************
*** 54,58 ****
  %fragment(SWIG_From_frag(std::wstring),"header",
  	  fragment="SWIG_FromWCharArray") {
! SWIGINTERNSHORT PyObject*
    SWIG_From(std::wstring)(const std::wstring& s)
    {
--- 54,58 ----
  %fragment(SWIG_From_frag(std::wstring),"header",
  	  fragment="SWIG_FromWCharArray") {
! SWIGINTERNINLINE PyObject*
    SWIG_From(std::wstring)(const std::wstring& s)
    {
***************
*** 69,73 ****
      std::wstring *s;
      int res = SWIG_AsPtr(std::wstring)(obj, &s);
!     if (res && s) {
        if (val) *val = *s;
        if (res == SWIG_NEWOBJ) delete s;
--- 69,73 ----
      std::wstring *s;
      int res = SWIG_AsPtr(std::wstring)(obj, &s);
!     if ((res != 0) && s) {
        if (val) *val = *s;
        if (res == SWIG_NEWOBJ) delete s;

Index: pystdcommon.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pystdcommon.swg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pystdcommon.swg	15 Nov 2004 22:59:47 -0000	1.3
--- pystdcommon.swg	24 Feb 2005 23:48:19 -0000	1.4
***************
*** 79,83 ****
  	Type *p = 0;
  	int res = traits_asptr<Type>::asptr(obj, &p);
! 	if (res && p) {
  	  typedef typename noconst_traits<Type>::noconst_type noconst_type;
  	  *(const_cast<noconst_type*>(val)) = *p;
--- 79,83 ----
  	Type *p = 0;
  	int res = traits_asptr<Type>::asptr(obj, &p);
! 	if ((res != 0) && p) {
  	  typedef typename noconst_traits<Type>::noconst_type noconst_type;
  	  *(const_cast<noconst_type*>(val)) = *p;

Index: pyapi.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pyapi.swg,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pyapi.swg	22 Feb 2005 19:54:20 -0000	1.10
--- pyapi.swg	24 Feb 2005 23:48:19 -0000	1.11
***************
*** 15,20 ****
  #endif
  
! #ifndef SWIGINTERNSHORT
! #  define SWIGINTERNSHORT SWIGINTERN SWIGINLINE
  #endif
  
--- 15,20 ----
  #endif
  
! #ifndef SWIGINTERNINLINE
! #  define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
  #endif
  

Index: pyptrtypes.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pyptrtypes.swg,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pyptrtypes.swg	21 Dec 2004 20:07:15 -0000	1.13
--- pyptrtypes.swg	24 Feb 2005 23:48:19 -0000	1.14
***************
*** 116,120 ****
    %fragment(SWIG_AsVal_frag(Type),"header",
  	    fragment=SWIG_AsPtr_frag(Type)) %{
!   SWIGINTERNSHORT int
      SWIG_AsVal(Type)(PyObject* obj, Type *val)
      {
--- 116,120 ----
    %fragment(SWIG_AsVal_frag(Type),"header",
  	    fragment=SWIG_AsPtr_frag(Type)) %{
!   SWIGINTERNINLINE int
      SWIG_AsVal(Type)(PyObject* obj, Type *val)
      {
***************
*** 131,135 ****
    %fragment(SWIG_As_frag(Type),"header",
  	    fragment=SWIG_AsVal_frag(Type)) %{
!   SWIGINTERNSHORT Type
      SWIG_As(Type)(PyObject* obj)
      {
--- 131,135 ----
    %fragment(SWIG_As_frag(Type),"header",
  	    fragment=SWIG_AsVal_frag(Type)) %{
!   SWIGINTERNINLINE Type
      SWIG_As(Type)(PyObject* obj)
      {

Index: std_string.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/std_string.i,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** std_string.i	1 Nov 2004 22:17:30 -0000	1.22
--- std_string.i	24 Feb 2005 23:48:20 -0000	1.23
***************
*** 52,56 ****
  %fragment(SWIG_From_frag(std::string),"header",
  	  fragment="SWIG_FromCharArray") {
! SWIGINTERNSHORT PyObject*
    SWIG_From(std::string)(const std::string& s)
    {
--- 52,56 ----
  %fragment(SWIG_From_frag(std::string),"header",
  	  fragment="SWIG_FromCharArray") {
! SWIGINTERNINLINE PyObject*
    SWIG_From(std::string)(const std::string& s)
    {
***************
*** 66,70 ****
      std::string* s;
      int res = SWIG_AsPtr(std::string)(obj, &s);
!     if (res && s) {
        if (val) *val = *s;
        if (res == SWIG_NEWOBJ) delete s;
--- 66,70 ----
      std::string* s;
      int res = SWIG_AsPtr(std::string)(obj, &s);
!     if ((res != 0) && s) {
        if (val) *val = *s;
        if (res == SWIG_NEWOBJ) delete s;

Index: pywstrings.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pywstrings.swg,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pywstrings.swg	11 Dec 2004 08:30:39 -0000	1.10
--- pywstrings.swg	24 Feb 2005 23:48:20 -0000	1.11
***************
*** 129,133 ****
  
  %fragment("SWIG_FromWCharArray","header") {
! SWIGINTERNSHORT PyObject *
  SWIG_FromWCharArray(const wchar_t * carray, size_t size)
  {
--- 129,133 ----
  
  %fragment("SWIG_FromWCharArray","header") {
! SWIGINTERNINLINE PyObject *
  SWIG_FromWCharArray(const wchar_t * carray, size_t size)
  {