Show
Ignore:
Timestamp:
10/24/07 19:30:30 (11 months ago)
Author:
cneumann
Message:

fixed: FieldBundle? templates, pointers and fields updated

lots of compile errors - some remain

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork/Source/Contrib/Manipulators/OSGScaleManipulatorBase.cpp

    r976 r988  
    5757#include <cstdio> 
    5858#include <boost/assign/list_of.hpp> 
     59#include <boost/bind.hpp> 
    5960 
    6061#include <OSGConfig.h> 
    …… 
    6667#include "OSGScaleManipulator.h" 
    6768 
    68 #include "boost/bind.hpp" 
    6969 
    7070OSG_BEGIN_NAMESPACE 
    …… 
    8484    "NULL", 
    8585    0, 
    86     (PrototypeCreateF) &ScaleManipulatorBase::createEmpty, 
     86    (ProtoContainerCreateF) &ScaleManipulatorBase::createEmpty, 
    8787    ScaleManipulator::initMethod, 
    8888    NULL, 
    …… 
    109109/*------------------------------ get -----------------------------------*/ 
    110110 
    111 FieldContainerType &ScaleManipulatorBase::getType(void) 
     111FieldContainerType & 
     112ScaleManipulatorBase::getType(void) 
    112113{ 
    113114    return _type; 
    114115} 
    115116 
    116 const FieldContainerType &ScaleManipulatorBase::getType(void) const 
     117FieldContainerType const & 
     118ScaleManipulatorBase::getType(void) const 
    117119{ 
    118120    return _type; 
    119121} 
    120122 
    121 UInt32 ScaleManipulatorBase::getContainerSize(void) const 
     123UInt32 
     124ScaleManipulatorBase::getContainerSize(void) const 
    122125{ 
    123126    return sizeof(ScaleManipulator);