ap-python-commits

[<sj...@us...>]

Update of /cvsroot/ap-python/python/src
In directory usw-pr-cvs1:/tmp/cvs-serv16335

Modified Files:
	pycoreplayer.cpp pyplaylist.cpp 
Log Message:
Fix compilation with gcc 3.1. Remove check for instance arg for CorePlayer::RegisterNotifer and CorePlayer::UnregisterNotifier. And the same for Playlist::Register and Playlist::Unregister. This is useful in Python2.2.

Index: pycoreplayer.cpp
===================================================================
RCS file: /cvsroot/ap-python/python/src/pycoreplayer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pycoreplayer.cpp	6 Jul 2002 17:40:26 -0000	1.6
--- pycoreplayer.cpp	21 Jul 2002 09:27:31 -0000	1.7
***************
*** 274,281 ****
  
      // First parameter must be instance
!     if (!PyInstance_Check (instance)) {
! 	PyErr_SetString (PyExc_TypeError, "first parameter must be instance");
  	return NULL;
!     }
   
      // Allocate structure
--- 274,281 ----
  
      // First parameter must be instance
!     /* if (!PyInstance_Check (instance) && !PyCObject_Check (instance)) {
! 	PyErr_SetString (PyExc_TypeError, "first parameter must be instance or object");
  	return NULL;
!     }*/
   
      // Allocate structure
***************
*** 332,339 ****
  
      // First parameter must be instance
!     if (!PyInstance_Check (instance)) {
  	PyErr_SetString (PyExc_TypeError, "first parameter must be instance");
  	return NULL;
!     }
     
      // Search for notifiers in base
--- 332,339 ----
  
      // First parameter must be instance
!     /* if (!PyInstance_Check (instance)) {
  	PyErr_SetString (PyExc_TypeError, "first parameter must be instance");
  	return NULL;
!     } */
     
      // Search for notifiers in base
***************
*** 348,352 ****
  
  	    free (notifier);
! 	    self->registered_notifiers->erase (&(*self->registered_notifiers) [i]);
  	    Py_DECREF (inst);
  
--- 348,352 ----
  
  	    free (notifier);
! 	    self->registered_notifiers->erase (self->registered_notifiers->begin() + i);
  	    Py_DECREF (inst);
  

Index: pyplaylist.cpp
===================================================================
RCS file: /cvsroot/ap-python/python/src/pyplaylist.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pyplaylist.cpp	31 May 2002 20:05:02 -0000	1.5
--- pyplaylist.cpp	21 Jul 2002 09:27:31 -0000	1.6
***************
*** 344,351 ****
  
      // First parameter must be instance
!     if (!PyInstance_Check (instance)) {
  	PyErr_SetString (PyExc_TypeError, "first parameter must be instance");
  	return NULL;
!     }
     
      Py_BEGIN_ALLOW_THREADS
--- 344,351 ----
  
      // First parameter must be instance
!     /* if (!PyInstance_Check (instance)) {
  	PyErr_SetString (PyExc_TypeError, "first parameter must be instance");
  	return NULL;
!     } */
     
      Py_BEGIN_ALLOW_THREADS
***************
*** 392,399 ****
  
      // First parameter must be instance
!     if (!PyInstance_Check (instance)) {
  	PyErr_SetString (PyExc_TypeError, "first parameter must be instance");
  	return NULL;
!     }
     
      // Search for wrapper
--- 392,399 ----
  
      // First parameter must be instance
!     /* if (!PyInstance_Check (instance)) {
  	PyErr_SetString (PyExc_TypeError, "first parameter must be instance");
  	return NULL;
!     } */
     
      // Search for wrapper
***************
*** 410,414 ****
  	    delete wrapper;
  	    delete (*self->registered) [i];
! 	    self->registered->erase (&(*self->registered) [i]);
  
  	    break;
--- 410,414 ----
  	    delete wrapper;
  	    delete (*self->registered) [i];
! 	    self->registered->erase (self->registered->begin() +i);
  
  	    break;