Show
Ignore:
Timestamp:
01/16/08 16:07:40 (1 year ago)
Author:
cneumann
Message:

changed: - factory functions return a TransitPtr? that can not be implicitly

converted to C Ptr. Should help with porting.

added: - GlobalRefPtr?, needed for cases where upon return from main

a RefPtr? goes out of scope (it would attempt to access the
FCFactory which is already shutdown at that point).

status: - vrml loader does not compile (needs porting to ref ptr)

  • tutorials compile, run and exit cleanly
  • multithreading and cluster are untested, yet
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FileIO/OSB/OSGNFIOGeoConversion.cpp

    r785 r1039  
    8686    /*! \{                                                                 */ 
    8787 
    88     virtual FieldContainerPtr readFC(const std::string &/*typeName*/) 
     88    virtual FieldContainerTransitPtr readFC(const std::string &/*typeName*/) 
    8989    { 
    9090        FDEBUG(("NFIOGeoConversion::readFC\n")); 
    …… 
    115115        //printf("NFIOGeoConversion::readFC : got field '%s' type '%s'\n", fieldName.c_str(), fieldType.c_str()); 
    116116 
    117         typename PropType::ObjPtr pnts = PropType::create(); 
    118         typename PropType::StoredFieldType *p = pnts->editFieldPtr(); 
     117        typename PropType::ObjRefPtr        pnts = PropType::create(); 
     118        typename PropType::StoredFieldType *p    = pnts->editFieldPtr(); 
    119119     
    120120        p->copyFromBin(*_in); 
    …… 
    125125        //printf("NFIOGeoConversion::readFC : reading %u elements.\n", p->size()); 
    126126     
    127         return pnts; 
     127        return FieldContainerTransitPtr(pnts); 
    128128    } 
    129129