[PD-cvs] externals/grill/flext/source fllib.cpp, 1.34, 1.35 flmap.h, 1.22, 1.23 - Pd-cvs

11 Oct 2005


      Update of /cvsroot/pure-data/externals/grill/flext/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5643/source
Modified Files:
    fllib.cpp flmap.h 
Log Message:
fix for Codewarrior compilation
Index: flmap.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmap.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** flmap.h	6 Jul 2005 16:08:19 -0000	1.22
--- flmap.h	11 Oct 2005 10:09:23 -0000	1.23
***************
*** 145,149 ****
  #endif
!     Data *const data;
      TableAnyMap *parent,*left,*right;
      int n;
--- 145,149 ----
  #endif
!     Data *data;
      TableAnyMap *parent,*left,*right;
      int n;
Index: fllib.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/fllib.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** fllib.cpp	23 May 2005 16:52:45 -0000	1.34
--- fllib.cpp	11 Oct 2005 10:09:23 -0000	1.35
***************
*** 19,22 ****
--- 19,23 ----
  #include <string.h>
  #include <ctype.h>
+ #include <map>
#define ALIASDEL ','
***************
*** 128,141 ****
  {}
- 
  typedef TablePtrMap<const t_symbol *,flext_class *,8> LibMap;
! 
! static LibMap libnames;
//! Store or retrieve registered classes
  static flext_class *FindName(const t_symbol *s,flext_class *o = NULL) 
  {
!     flext_class *cl = libnames.find(s);
!     if(!cl) libnames.insert(s,cl = o);
      return cl;
  }
--- 129,143 ----
  {}
typedef TablePtrMap<const t_symbol *,flext_class *,8> LibMap;
! // static initialization (with constructor) doesn't work for Codewarrior
! static LibMap *libnames = NULL;
//! Store or retrieve registered classes
  static flext_class *FindName(const t_symbol *s,flext_class *o = NULL) 
  {
! 	if(!libnames) libnames = new LibMap;
!     flext_class *cl = libnames->find(s);
!     if(!cl && o)
!     	libnames->insert(s,cl = o);
      return cl;
  }