Show
Ignore:
Timestamp:
04/07/08 02:50:33 (8 months ago)
Author:
vossg
Message:

changed: merged some merge changes back to have a running reference

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGParentPointerMFieldBase.h

    r1072 r1138  
    1010 
    1111#include "OSGPointerMFieldCommon.h" 
    12 #include "OSGWeakAccessHandlerDecl.h" 
     12#include "OSGNoRefCountAccessHandlerDecl.h" 
    1313 
    1414#ifdef OSG_DOC_FILES_IN_MODULE 
    …… 
    2323template <Int32 NamespaceI = 0> 
    2424class ParentPointerMFieldBase  
    25     : public PointerMFieldCommon<WeakAccessHandler, NamespaceI> 
     25    : public PointerMFieldCommon<NoRefCountAccessHandler, NamespaceI> 
    2626{ 
    2727    /*==========================  PUBLIC  =================================*/ 
    …… 
    3131    /*! \{                                                                 */ 
    3232     
    33     typedef          PointerMFieldCommon<WeakAccessHandler, 
     33    typedef          PointerMFieldCommon<NoRefCountAccessHandler, 
    3434                                         NamespaceI        > Inherited; 
    3535    typedef          ParentPointerMFieldBase                 Self;