Changeset 1195

Show
Ignore:
Timestamp:
05/05/08 06:43:12 (1 week ago)
Author:
vossg
Message:

fixed: vs2003 compile problems

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Source/Contrib/Manipulators/OSGManipulator.cpp

    r1168 r1195  
    166166            } 
    167167 
    168             if ( NullFC != _activeParent ) 
     168            if ( _activeParent != NullFC ) 
    169169            { 
    170170                subHandleGeo(_activeParent); 

  • trunk/Source/System/FieldContainer/Attachments/OSGStringAttributeMap.cpp

    r1194 r1195  
    218218        attr_map = dynamic_cast<StringAttributeMapPtr>(attach_ptr); 
    219219 
    220         if ( NullFC == attr_map ) 
     220        if ( attr_map == NullFC ) 
    221221        { 
    222222            FFATAL(("stringAttributeMap: StringAttributeMap Attachment is not castable to StringAttributeMap?!?\n")); 

  • trunk/Source/System/FieldContainer/Base/OSGRefCountPtr.inl

    r1181 r1195  
    162162template <class ObjectT,  
    163163          class RefCountPolicyT> inline 
    164 RefCountPtr<ObjectT, RefCountPolicyT>::operator ObjectPtr (void) const 
     164RefCountPtr<ObjectT, RefCountPolicyT>::operator  
     165    typename RefCountPtr<ObjectT, RefCountPolicyT>::ObjectPtr (void) const 
    165166{ 
    166167    return RefCountPolicy::validate(_pObj); 

  • trunk/Source/System/FieldContainer/Fields/PointerFields/OSGChildPointerMField.inl

    r1165 r1195  
    662662ChildMFieldReferenceProxy<PtrTypeT,  
    663663                          RefCountPolicy,  
    664                           iNamespace    >::operator const_value(void) const 
     664                          iNamespace    >::operator  
     665    typename ChildMFieldReferenceProxy<PtrTypeT,  
     666                                       RefCountPolicy,  
     667                                       iNamespace    >::const_value(void) const 
    665668{ 
    666669    return static_cast<const_value>(AccessHandler::validate(*_storeIter)); 

  • trunk/Source/System/FieldContainer/Node/OSGCoredNodePtr.inl

    r1177 r1195  
    166166 
    167167template<class CoreT> inline 
    168 CoredNodeRefPtr<CoreT>::operator CorePtr(void) 
     168CoredNodeRefPtr<CoreT>::operator  
     169    typename CoredNodeRefPtr<CoreT>::CorePtr(void) 
    169170{ 
    170171#ifdef OSG_DEBUG 
    …… 
    383384 
    384385template<class CoreT> inline 
    385 CoredNodeMTRefPtr<CoreT>::operator CorePtr(void) 
     386CoredNodeMTRefPtr<CoreT>::operator  
     387    typename CoredNodeMTRefPtr<CoreT>::CorePtr(void) 
    386388{ 
    387389#ifdef OSG_DEBUG 

  • trunk/Source/System/Text/OSGTextTXFFace.cpp

    r1097 r1195  
    214214 
    215215    // Create color buffer: If Null container AND color is set && we have not potentially added text before 
    216     if ((NullFC == colorPtr) && (color != OSG::Color3f(-1,-1,-1)) && 
    217         ((NullFC == posPtr) && (NullFC == texPtr)) ) 
     216    if ((colorPtr == NullFC) && (color != OSG::Color3f(-1,-1,-1)) && 
     217        ((posPtr == NullFC) && (texPtr == NullFC)) ) 
    218218    { 
    219219       colorPtr = GeoColor3fProperty::create(); 
    220220       geoPtr->setColors(colorPtr); 
    221221    } 
    222     bool use_colors(NullFC != colorPtr); 
     222    bool use_colors(colorPtr != NullFC); 
    223223 
    224224    if (posPtr == NullFC)