[Gcblue-commits] gcb_wx/src/database tcDatabase.cpp,1.6,1.7

[<ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14729/src/database

Modified Files:
	tcDatabase.cpp 
Log Message:


Index: tcDatabase.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabase.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcDatabase.cpp	30 Jan 2004 01:02:34 -0000	1.6
--- tcDatabase.cpp	7 Feb 2004 02:19:54 -0000	1.7
***************
*** 168,172 ****
        if (!IsVersionSupported()) {return BAD_VERSION;}
        file.Read(&nMapSize,sizeof(nMapSize));
!       for(unsigned int i=0;i<nMapSize;i++) {
           file.Read(&nClassID,sizeof(nClassID));
           nResult = false;
--- 168,172 ----
        if (!IsVersionSupported()) {return BAD_VERSION;}
        file.Read(&nMapSize,sizeof(nMapSize));
!       for(int i=0;i<nMapSize;i++) {
           file.Read(&nClassID,sizeof(nClassID));
           nResult = false;
***************
*** 709,713 ****
     nMapSize = mcObjectData.GetCount();
     nPoolPos = mcObjectData.GetStartPosition();
!    for(unsigned int i=0;i<nMapSize;i++) {
        mcObjectData.GetNextAssoc(nPoolPos,nKey,pdbobj);
        nClassID = pdbobj->mnClassID;
--- 709,713 ----
     nMapSize = mcObjectData.GetCount();
     nPoolPos = mcObjectData.GetStartPosition();
!    for(int i=0;i<nMapSize;i++) {
        mcObjectData.GetNextAssoc(nPoolPos,nKey,pdbobj);
        nClassID = pdbobj->mnClassID;
***************
*** 824,828 ****
      tcDatabaseObject *obj;
  
!     for (unsigned i=0;i<nPoolSize;i++) 
      {
          key = mcObjectData.GetNextKey(key);
--- 824,828 ----
      tcDatabaseObject *obj;
  
!     for (int i=0;i<nPoolSize;i++) 
      {
          key = mcObjectData.GetNextKey(key);
***************
*** 847,851 ****
     nClassID = pobj->mnClassID;
  
!    for (unsigned i=0;i<nPoolSize;i++) {
        nCurrentKey = mcObjectData.GetNextKey(nCurrentKey);
        if (mcObjectData.Lookup(nCurrentKey,pobj)==false) {return NULL_INDEX;} // error
--- 847,851 ----
     nClassID = pobj->mnClassID;
  
!    for (int i=0;i<nPoolSize;i++) {
        nCurrentKey = mcObjectData.GetNextKey(nCurrentKey);
        if (mcObjectData.Lookup(nCurrentKey,pobj)==false) {return NULL_INDEX;} // error
***************
*** 868,872 ****
     nClassID = pobj->mnClassID;
  
!    for (unsigned i=0;i<nPoolSize;i++) {
        nCurrentKey = mcObjectData.GetPrevKey(nCurrentKey);
        if (mcObjectData.Lookup(nCurrentKey,pobj)==false) {return NULL_INDEX;} // error
--- 868,872 ----
     nClassID = pobj->mnClassID;
  
!    for (int i=0;i<nPoolSize;i++) {
        nCurrentKey = mcObjectData.GetPrevKey(nCurrentKey);
        if (mcObjectData.Lookup(nCurrentKey,pobj)==false) {return NULL_INDEX;} // error
***************
*** 885,889 ****
     nPoolSize = mcObjectData.GetCount();
     nPoolPos = mcObjectData.GetStartPosition();
!    for (unsigned i=0;i<nPoolSize;i++) {
        mcObjectData.GetNextAssoc(nPoolPos,nKey,pdbobj);
        if (pdbobj == NULL) {
--- 885,889 ----
     nPoolSize = mcObjectData.GetCount();
     nPoolPos = mcObjectData.GetStartPosition();
!    for (int i=0;i<nPoolSize;i++) {
        mcObjectData.GetNextAssoc(nPoolPos,nKey,pdbobj);
        if (pdbobj == NULL) {
***************
*** 954,958 ****
     nMapSize = mcObjectData.GetCount();
     nPoolPos = mcObjectData.GetStartPosition();
!    for (unsigned int i=0;(i<nMapSize)&&(!bFound);i++) {
        mcObjectData.GetNextAssoc(nPoolPos,nKey,pdbobj);      
        bFound = (pdbobj->mzClass == s);
--- 954,958 ----
     nMapSize = mcObjectData.GetCount();
     nPoolPos = mcObjectData.GetStartPosition();
!    for (int i=0;(i<nMapSize)&&(!bFound);i++) {
        mcObjectData.GetNextAssoc(nPoolPos,nKey,pdbobj);      
        bFound = (pdbobj->mzClass == s);
***************
*** 970,974 ****
     nMapSize = mcObjectData.GetCount();
     nPoolPos = mcObjectData.GetStartPosition();
!    for (unsigned int i=0;(i<nMapSize);i++) {
        mcObjectData.GetNextAssoc(nPoolPos,nKey,pdbobj); 
        pdbobj->RandInit();
--- 970,974 ----
     nMapSize = mcObjectData.GetCount();
     nPoolPos = mcObjectData.GetStartPosition();
!    for (int i=0;(i<nMapSize);i++) {
        mcObjectData.GetNextAssoc(nPoolPos,nKey,pdbobj); 
        pdbobj->RandInit();