Changeset 16b217d in tol


Ignore:
Timestamp:
Nov 5, 2009, 10:59:27 AM (17 years ago)
Author:
Víctor de Buen <vdebuen@…>
Branches:
1941-docker-image-to-test, devel, master
Children:
90037b0
Parents:
137bfb2
Message:

Fixes #775

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1610 be4846ae-f051-483a-831f-b64e7d08527f

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tol/OIS/oisloader.cpp

    r137bfb2 r16b217d  
    704704  ERead(tol_type,         object_);
    705705  ERead(name,             object_);
     706
    706707  BGrammar* gra = BGrammar::FindByGid((BGrammarId)tol_type,true);
    707708  if(system)
    … …  
    862863      else if(mode==BOBJECTMODE)
    863864      {
     865        BUserNameBlock* oldBuilding = BNameBlock::Building();
     866        BNameBlock::SetBuilding(NULL);
    864867        if(tol_type == BGI_Real)
    865868        {
    … …  
    10531056          assert(isNameBlock);
    10541057          ERead(fullName,set_);
    1055 
    1056           BUserNameBlock* oldBuilding = BNameBlock::Building();
    10571058        //const BNameBlock* oldCurrent = BNameBlock::Current();
    10581059          BGrammar::IncLevel();
    … …  
    10621063        //BNameBlock::SetCurrent(&unb->Contens());
    10631064          unb->PutDescription(description);
    1064           assert(GraNameBlock()->FindLocal(name)==unb);
     1065          assert(!name.HasName() || (GraNameBlock()->FindLocal(name)==unb));
    10651066          readed_[found].PutObject(unb);
    10661067          BNameBlock& x = unb->Contens();
    … …  
    11331134            }
    11341135          }
    1135           BNameBlock::SetBuilding(oldBuilding);
    11361136        //BNameBlock::SetCurrent(oldCurrent);
    11371137          BGrammar::DestroyStackUntil(stackPos, unb);   
    … …  
    13151315          { result = x; }
    13161316        }
     1317        BNameBlock::SetBuilding(oldBuilding);
    13171318      }
    13181319      else
Note: See TracChangeset for help on using the changeset viewer.