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

From Ruth Lang, "using osg version 2.5.5 and compiling my program under OpenSUSE 11.0

Browse Source 
with  gcc (version 4.3.1) I got the following error message in
include/osgUtil/TriStripVisitor and Tessellator

error: type qualifiers ignored on function return type

The errors belong all to a INLINE function definition. Find attached my
modified version."
This commit is contained in:
Robert Osfield
2008-07-21 21:20:21 +00:00
parent 573044ceea
commit 5e80c3856f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgUtil/Tessellator
View File

@@ -60,15 +60,15 @@ class OSGUTIL_EXPORT Tessellator : public osg::Referenced
/** Set and get tessellation request boundary only on/off */
void setBoundaryOnly (const bool tt) { _boundaryOnly=tt;}
inline const bool getBoundaryOnly ( ) { return _boundaryOnly;}
inline bool getBoundaryOnly ( ) { return _boundaryOnly;}
/** Set and get tessellation windong rule */
void setWindingType (const WindingType wt) { _wtype=wt;}
inline const WindingType getWindingType ( ) { return _wtype;}
inline WindingType getWindingType ( ) { return _wtype;}
/** Set and get tessellation type */
void setTessellationType (const TessellationType tt) { _ttype=tt;}
inline const TessellationType getTessellationType ( ) { return _ttype;}
inline TessellationType getTessellationType ( ) { return _ttype;}
/** Change the contours lists of the geometry into tessellated primitives (the
* list of primitives in the original geometry is stored in the Tessellator for

4
include/osgUtil/TriStripVisitor
View File

@@ -61,7 +61,7 @@ class OSGUTIL_EXPORT TriStripVisitor : public BaseOptimizerVisitor
return _cacheSize;
}
inline const unsigned int getCacheSize() const
inline unsigned int getCacheSize() const
{
return _cacheSize;
}
@@ -76,7 +76,7 @@ class OSGUTIL_EXPORT TriStripVisitor : public BaseOptimizerVisitor
return _minStripSize;
}
inline const unsigned int getMinStripSize() const
inline unsigned int getMinStripSize() const
{
return _minStripSize;
}