Show
Ignore:
Timestamp:
04/06/07 00:00:32 (2 years ago)
Author:
vossg
Message:

fixed : improved multi aspect value field deletion

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/mixin-collappse/Source/System/Cluster/Window/Base/OSGClusterWindowBase.cpp

    r658 r660  
    12811281#endif 
    12821282 
    1283 void ClusterWindowBase::resolveLinks(UInt32             uiCurrentAspect, 
    1284                                      AspectOffsetStore &oOffsets) 
    1285 { 
    1286     Inherited::resolveLinks(uiCurrentAspect, oOffsets); 
     1283void ClusterWindowBase::resolveLinks(void) 
     1284{ 
     1285    Inherited::resolveLinks(); 
    12871286 
    12881287    static_cast<ClusterWindow *>(this)->setClientWindow(NullFC); 
    …… 
    12901289    static_cast<ClusterWindow *>(this)->setComposer(NullFC); 
    12911290 
    1292     _mfServers.terminateShare(uiCurrentAspect, oOffsets); 
    1293  
    1294     _mfAutostart.terminateShare(uiCurrentAspect, oOffsets); 
     1291#ifdef OSG_MT_CPTR_ASPECT 
     1292    AspectOffsetStore oOffsets; 
     1293 
     1294    _pAspectStore->fillOffsetArray(oOffsets, this); 
     1295#endif 
     1296 
     1297 
     1298#ifdef OSG_MT_CPTR_ASPECT 
     1299    _mfServers.terminateShare(Thread::getCurrentAspect(),  
     1300                                      oOffsets); 
     1301#endif 
     1302 
     1303#ifdef OSG_MT_CPTR_ASPECT 
     1304    _mfAutostart.terminateShare(Thread::getCurrentAspect(),  
     1305                                      oOffsets); 
     1306#endif 
    12951307} 
    12961308