Update of /cvsroot/pure-data/externals/grill/pool/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12991/source
Modified Files:
main.cpp
Log Message:
more fixes for gcc 3.4
Index: main.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/pool/source/main.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main.cpp 7 Jun 2005 14:14:50 -0000 1.10
--- main.cpp 9 Jun 2005 14:48:46 -0000 1.11
***************
*** 122,127 ****
V set(I argc,const A *argv,BL over);
V getdir(const S *tag);
! I getrec(const S *tag,I level,BL order,get_t how = get_norm,const AtomList &rdir = AtomList());
! I getsub(const S *tag,I level,BL order,get_t how = get_norm,const AtomList &rdir = AtomList());
V paste(const S *tag,I argc,const A *argv,BL repl);
--- 122,127 ----
V set(I argc,const A *argv,BL over);
V getdir(const S *tag);
! I getrec(const S *tag,I level,BL order,get_t how /*= get_norm*/,const AtomList &rdir);
! I getsub(const S *tag,I level,BL order,get_t how /*= get_norm*/,const AtomList &rdir);
V paste(const S *tag,I argc,const A *argv,BL repl);
***************
*** 659,663 ****
I lv = level > 0?level-1:-1;
for(I i = 0; i < cnt; ++i) {
! ret += getrec(tag,lv,order,how,Atoms(rdir).Append(*r[i]));
}
delete[] r;
--- 659,664 ----
I lv = level > 0?level-1:-1;
for(I i = 0; i < cnt; ++i) {
! Atoms l(rdir); l.Append(*r[i]);
! ret += getrec(tag,lv,order,how,l);
}
delete[] r;
***************
*** 670,674 ****
V pool::m_getall()
{
! getrec(thisTag(),0,false);
ToOutBang(3);
--- 671,676 ----
V pool::m_getall()
{
! AtomList l;
! getrec(thisTag(),0,false,get_norm,l);
ToOutBang(3);
***************
*** 678,682 ****
V pool::m_ogetall()
{
! getrec(thisTag(),0,true);
ToOutBang(3);
--- 680,685 ----
V pool::m_ogetall()
{
! AtomList l;
! getrec(thisTag(),0,true,get_norm,l);
ToOutBang(3);
***************
*** 696,700 ****
post("%s - %s: invalid level specification - set to infinite",thisName(),GetString(thisTag()));
}
! getrec(thisTag(),lvls,false);
ToOutBang(3);
--- 699,705 ----
post("%s - %s: invalid level specification - set to infinite",thisName(),GetString(thisTag()));
}
!
! AtomList l;
! getrec(thisTag(),lvls,false,get_norm,l);
ToOutBang(3);
***************
*** 715,719 ****
post("%s - %s: invalid level specification - set to infinite",thisName(),GetString(thisTag()));
}
! getrec(thisTag(),lvls,true);
ToOutBang(3);
--- 720,726 ----
post("%s - %s: invalid level specification - set to infinite",thisName(),GetString(thisTag()));
}
!
! AtomList l;
! getrec(thisTag(),lvls,true,get_norm,l);
ToOutBang(3);
***************
*** 748,753 ****
}
! if(level != 0)
! ret += getsub(tag,lv,order,how,Atoms(rdir).Append(*r[i]));
}
delete[] r;
--- 755,762 ----
}
! if(level != 0) {
! AtomList l(rdir); l.Append(*r[i]);
! ret += getsub(tag,lv,order,how,l);
! }
}
delete[] r;
***************
*** 769,774 ****
post("%s - %s: invalid level specification - set to 0",thisName(),GetString(thisTag()));
}
!
! getsub(thisTag(),lvls,false);
ToOutBang(3);
--- 778,784 ----
post("%s - %s: invalid level specification - set to 0",thisName(),GetString(thisTag()));
}
!
! AtomList l;
! getsub(thisTag(),lvls,false,get_norm,l);
ToOutBang(3);
***************
*** 790,794 ****
}
! getsub(thisTag(),lvls,true);
ToOutBang(3);
--- 800,805 ----
}
! AtomList l;
! getsub(thisTag(),lvls,true,get_norm,l);
ToOutBang(3);
***************
*** 799,803 ****
V pool::m_cntall()
{
! I cnt = getrec(thisTag(),0,false,get_cnt);
ToOutSymbol(3,thisTag());
ToOutBang(2);
--- 810,815 ----
V pool::m_cntall()
{
! AtomList l;
! I cnt = getrec(thisTag(),0,false,get_cnt,l);
ToOutSymbol(3,thisTag());
ToOutBang(2);
***************
*** 821,825 ****
}
! I cnt = getrec(thisTag(),lvls,false,get_cnt);
ToOutSymbol(3,thisTag());
ToOutBang(2);
--- 833,838 ----
}
! AtomList l;
! I cnt = getrec(thisTag(),lvls,false,get_cnt,l);
ToOutSymbol(3,thisTag());
ToOutBang(2);
***************
*** 844,848 ****
}
! I cnt = getsub(thisTag(),lvls,false,get_cnt);
ToOutSymbol(3,thisTag());
ToOutBang(2);
--- 857,862 ----
}
! AtomList l;
! I cnt = getsub(thisTag(),lvls,false,get_cnt,l);
ToOutSymbol(3,thisTag());
ToOutBang(2);
***************
*** 855,859 ****
V pool::m_printall()
{
! I cnt = getrec(thisTag(),0,false,get_print);
post("");
}
--- 869,874 ----
V pool::m_printall()
{
! AtomList l;
! I cnt = getrec(thisTag(),0,false,get_print,l);
post("");
}
***************
*** 877,881 ****
if(fromroot) curdir.Clear();
! I cnt = getrec(tag,lvls,false,get_print);
post("");
--- 892,897 ----
if(fromroot) curdir.Clear();
! AtomList l;
! I cnt = getrec(tag,lvls,false,get_print,l);
post("");