FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Ruben, fix for gcc 3.4 build

Browse Source
This commit is contained in:
Robert Osfield 2004-05-17 10:21:30 +00:00
parent edc9e498d7
commit 71150e96dc
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
include/osg/Array
View File

@ -126,11 +126,11 @@ class TemplateArray : public Array, public std::vector<T>
virtual Object* cloneType() const { return new TemplateArray(); } virtual Object* cloneType() const { return new TemplateArray(); }
virtual Object* clone(const CopyOp& copyop) const { return new TemplateArray(*this,copyop); } virtual Object* clone(const CopyOp& copyop) const { return new TemplateArray(*this,copyop); }
virtual void accept(ArrayVisitor& av) { av.apply(*this); } inline virtual void accept(ArrayVisitor& av);
virtual void accept(ConstArrayVisitor& av) const { av.apply(*this); } inline virtual void accept(ConstArrayVisitor& av) const;
virtual void accept(unsigned int index,ValueVisitor& vv) { vv.apply( (*this)[index] ); } inline virtual void accept(unsigned int index,ValueVisitor& vv);
virtual void accept(unsigned int index,ConstValueVisitor& vv) const { vv.apply( (*this)[index] );} inline virtual void accept(unsigned int index,ConstValueVisitor& vv) const;
virtual int compare(unsigned int lhs,unsigned int rhs) const virtual int compare(unsigned int lhs,unsigned int rhs) const
{ {
@ -204,11 +204,11 @@ class TemplateIndexArray : public IndexArray, public std::vector<T>
virtual Object* cloneType() const { return new TemplateIndexArray(); } virtual Object* cloneType() const { return new TemplateIndexArray(); }
virtual Object* clone(const CopyOp& copyop) const { return new TemplateIndexArray(*this,copyop); } virtual Object* clone(const CopyOp& copyop) const { return new TemplateIndexArray(*this,copyop); }
virtual void accept(ArrayVisitor& av) { av.apply(*this); } inline virtual void accept(ArrayVisitor& av);
virtual void accept(ConstArrayVisitor& av) const { av.apply(*this); } inline virtual void accept(ConstArrayVisitor& av) const;
virtual void accept(unsigned int index,ValueVisitor& vv) { vv.apply( (*this)[index] ); } inline virtual void accept(unsigned int index,ValueVisitor& vv);
virtual void accept(unsigned int index,ConstValueVisitor& vv) const { vv.apply( (*this)[index] );} inline virtual void accept(unsigned int index,ConstValueVisitor& vv) const;
virtual int compare(unsigned int lhs,unsigned int rhs) const virtual int compare(unsigned int lhs,unsigned int rhs) const
{ {
@ -318,6 +318,29 @@ class ConstValueVisitor
virtual void apply(const Vec4&) {} virtual void apply(const Vec4&) {}
}; };
template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
inline void TemplateArray<T,ARRAYTYPE,DataSize,DataType>::accept(ArrayVisitor& av) { av.apply(*this); }
template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
inline void TemplateArray<T,ARRAYTYPE,DataSize,DataType>::accept(ConstArrayVisitor& av) const { av.apply(*this); }
template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
inline void TemplateArray<T,ARRAYTYPE,DataSize,DataType>::accept(unsigned int index,ValueVisitor& vv) { vv.apply( (*this)[index] ); }
template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
inline void TemplateArray<T,ARRAYTYPE,DataSize,DataType>::accept(unsigned int index,ConstValueVisitor& vv) const { vv.apply( (*this)[index] );}
template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
inline void TemplateIndexArray<T,ARRAYTYPE,DataSize,DataType>::accept(ArrayVisitor& av) { av.apply(*this); }
template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
inline void TemplateIndexArray<T,ARRAYTYPE,DataSize,DataType>::accept(ConstArrayVisitor& av) const { av.apply(*this); }
template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
inline void TemplateIndexArray<T,ARRAYTYPE,DataSize,DataType>::accept(unsigned int index,ValueVisitor& vv) { vv.apply( (*this)[index] ); }
template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
inline void TemplateIndexArray<T,ARRAYTYPE,DataSize,DataType>::accept(unsigned int index,ConstValueVisitor& vv) const { vv.apply( (*this)[index] );}
} }