Show
Ignore:
Timestamp:
12/03/07 15:48:13 (1 year ago)
Author:
cneumann
Message:

fixed: compile errors

reference counting


It compiles on linux (when disabling the VRML Loader) and the first
ref counting tests seem to work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGReferenceCountPointer.inl

    r1016 r1030  
    5858InternalRefCountPolicy<BaseObjectT>::addRef(BaseObjectPtrConstArg baseObjectPtr) 
    5959{ 
    60     baseObjectPtr->addReference(); 
     60    if(baseObjectPtr != NULL) 
     61        baseObjectPtr->addReference(); 
    6162} 
    6263 
    …… 
    6566InternalRefCountPolicy<BaseObjectT>::subRef(BaseObjectPtrConstArg baseObjectPtr) 
    6667{ 
    67     baseObjectPtr->subReference(); 
     68    if(baseObjectPtr != NULL) 
     69        baseObjectPtr->subReference(); 
    6870} 
    6971     
    …… 
    8385RefCountPolicy<BaseObjectT>::addRef(BaseObjectPtrConstArg baseObjectPtr) 
    8486{ 
    85     baseObjectPtr->addExternalReference(); 
     87    if(baseObjectPtr != NULL) 
     88        baseObjectPtr->addExternalReference(); 
    8689} 
    8790 
    …… 
    9093RefCountPolicy<BaseObjectT>::subRef(BaseObjectPtrConstArg baseObjectPtr) 
    9194{ 
    92     baseObjectPtr->subExternalReference(); 
     95    if(baseObjectPtr != NULL) 
     96        baseObjectPtr->subExternalReference(); 
    9397} 
    9498 
    …… 
    108112MTRefCountPolicy<BaseObjectT>::addRef(BaseObjectPtrConstArg baseObjectPtr) 
    109113{ 
    110     baseObjectPtr->addExternalReference(); 
     114    if(baseObjectPtr != NULL) 
     115        baseObjectPtr->addExternalReference(); 
    111116} 
    112117     
    …… 
    115120MTRefCountPolicy<BaseObjectT>::subRef(BaseObjectPtrConstArg baseObjectPtr) 
    116121{ 
    117     baseObjectPtr->subExternalReference(); 
     122    if(baseObjectPtr != NULL) 
     123        baseObjectPtr->subExternalReference(); 
    118124} 
    119125     
    …… 
    132138MTRefCountPolicy<FieldBundle>::addRef(BaseObjectPtrConstArg baseObjectPtr) 
    133139{ 
    134 //     baseObjectPtr->addExternalReference(); 
     140//     if(baseObjectPtr != NULL) 
     141//         baseObjectPtr->addExternalReference(); 
    135142} 
    136143     
    …… 
    138145MTRefCountPolicy<FieldBundle>::subRef(BaseObjectPtrConstArg baseObjectPtr) 
    139146{ 
    140 //     baseObjectPtr->subExternalReference(); 
     147//     if(baseObjectPtr != NULL) 
     148//         baseObjectPtr->subExternalReference(); 
    141149} 
    142150     
    …… 
    155163WeakRefCountPolicy<BaseObjectT>::addRef(BaseObjectPtrConstArg baseObjectPtr) 
    156164{ 
    157     baseObjectPtr->addWeakReference(); 
     165    if(baseObjectPtr != NULL) 
     166        baseObjectPtr->addWeakReference(); 
    158167} 
    159168 
    …… 
    162171WeakRefCountPolicy<BaseObjectT>::subRef(BaseObjectPtrConstArg baseObjectPtr) 
    163172{ 
    164     baseObjectPtr->subWeakReference(); 
     173    if(baseObjectPtr != NULL) 
     174        baseObjectPtr->subWeakReference(); 
    165175} 
    166176