Show
Ignore:
Timestamp:
03/07/08 16:15:33 (10 months ago)
Author:
cneumann
Message:

removed: getContainerId function calls

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGFieldContainerTest.cpp

    r1042 r1068  
    5555    CHECK(nrp->getWeakRefCount()     == 0); 
    5656 
    57     OSG::UInt32 node_id = getContainerId(nrp); 
     57    OSG::UInt32 node_id = nrp->getId(); 
    5858    CHECK(OSG::FieldContainerFactory::the()->getContainer(node_id) == nrp); 
    5959 
    …… 
    146146    // Check to make sure the memory is cleaned up correctly with an FCPtr 
    147147    OSG::NodeRefPtr  node(OSG::Node::create()); 
    148     OSG::UInt32   node_id   = OSG::getContainerId(node.get()); 
     148    OSG::UInt32   node_id   = node.get()->getId(); 
    149149    OSG::Int32    ref_count = getRefCount(node.get()); 
    150150    OSG::commitChanges(); 
    …… 
    204204    OSG::UInt32        kids = node->getNChildren(); 
    205205     
    206     OSG::UInt32   node_id = OSG::getContainerId(node); 
     206    OSG::UInt32   node_id = node->getId(); 
    207207    CHECK(OSG::FieldContainerFactory::the()->getContainer(node_id) != OSGNullFC); 
    208208    OSG::UInt8* base_ptr = node._storeP; 
    …… 
    228228    OSG::NodePtr node(OSG::Node::create()); 
    229229    OSG::NodePtr node_copy = node; 
    230     OSG::UInt32   node_id = OSG::getContainerId(node); 
     230    OSG::UInt32   node_id = node->getId(); 
    231231    CHECK(OSG::FieldContainerFactory::the()->getContainer(node_id) != OSGNullFC); 
    232232