Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31898/source

Modified Files: flattr_ed.cpp flmap.h flsupport.cpp Log Message: better c++ compliance fixes for MSVC6 restructured TableMap type (doesn't own pointers any more)

Index: flmap.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmap.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** flmap.h 25 Apr 2005 12:50:35 -0000 1.18 --- flmap.h 1 May 2005 03:12:05 -0000 1.19 *************** *** 85,89 **** iterator(): map(0) {} iterator(const TableAnyMap &m): map(&m),ix(0) { leftmost(); } ! iterator(iterator &it): map(it.map),ix(it.ix) {}

iterator &operator =(const iterator &it) { map = it.map,ix = it.ix; return *this; } --- 85,89 ---- iterator(): map(0) {} iterator(const TableAnyMap &m): map(&m),ix(0) { leftmost(); } ! iterator(const iterator &it): map(it.map),ix(it.ix) {}

iterator &operator =(const iterator &it) { map = it.map,ix = it.ix; return *this; } *************** *** 220,224 **** iterator() {} iterator(const TablePtrMap &m): TableAnyMap::iterator(m) {} ! iterator(iterator &it): TableAnyMap::iterator(it) {}

// this ugly syntax (cast to parent class) is needed for MSVC6 --- 220,224 ---- iterator() {} iterator(const TablePtrMap &m): TableAnyMap::iterator(m) {} ! iterator(const iterator &it): TableAnyMap::iterator(it) {}

// this ugly syntax (cast to parent class) is needed for MSVC6

Index: flsupport.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** flsupport.cpp 23 Apr 2005 09:14:20 -0000 1.52 --- flsupport.cpp 1 May 2005 03:12:05 -0000 1.53 *************** *** 327,328 **** --- 327,329 ---- }

+

Index: flattr_ed.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr_ed.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** flattr_ed.cpp 18 Apr 2005 15:07:39 -0000 1.37 --- flattr_ed.cpp 1 May 2005 03:12:05 -0000 1.38 *************** *** 89,93 **** --- 89,97 ---- "set tmp {}\n" "foreach a $lst {\n" + // "set a [regsub {\\} $a \\\\]\n" // replace \ with \ ... must be first "set a [regsub {\$} $a \\$]\n" // replace $ with $ + // "set a [regsub {\{} $a \\\{]\n" // replace { with { + // "set a [regsub {\}} $a \\\}]\n" // replace } with } + // "set a [regsub {\ } $a \\\ ]\n" // replace space with \space "set a [regsub {,} $a \\,]\n" // replace , with , "set a [regsub {;} $a \\\;]\n" // replace ; with ;