diff --git a/include/osgText/Font b/include/osgText/Font index 5cda9d13b..4283dc946 100644 --- a/include/osgText/Font +++ b/include/osgText/Font @@ -174,7 +174,7 @@ public: GlyphTexture(); /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ - virtual int compare(const StateAttribute& rhs) const; + virtual int compare(const osg::StateAttribute& rhs) const; void setStateSet(osg::StateSet* stateset) { _stateset = stateset; } osg::StateSet* getStateSet() { return _stateset; } diff --git a/src/osgText/Font.cpp b/src/osgText/Font.cpp index cc9b54c2c..247668b3d 100644 --- a/src/osgText/Font.cpp +++ b/src/osgText/Font.cpp @@ -287,7 +287,7 @@ Font::GlyphTexture::~GlyphTexture() } // return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. -int Font::GlyphTexture::compare(const StateAttribute& rhs) const +int Font::GlyphTexture::compare(const osg::StateAttribute& rhs) const { if (this<&rhs) return -1; else if (this>&rhs) return 1;