-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Amos Smith wrote:
> With code downloaded via svn this evening (revision 7671), I'm seeing a
> compilation error for osgDB SharedStateManager.cpp in Win32 Release mode.
> 
> Excerpt of error description:
> 
> C3848: expression having type 'const
> osgDB::SharedStateManager::CompareStateAttributes' would lose some
> const-volatile qualifiers in order to call 'bool
> osgDB::SharedStateManager::CompareStateAttributes::operator ()(const
> osg::ref_ptr<T> &,const osg::ref_ptr<T> &)'
> 
I believe this is the fault of my submission of changes to DatabasePager.
This should fix it:
diff --git a/include/osgDB/SharedStateManager b/include/osgDB/SharedStateManager
index 9e5e8ef..89f848c 100644
- --- a/include/osgDB/SharedStateManager
+++ b/include/osgDB/SharedStateManager
@@ -68,7 +68,7 @@ namespace osgDB {
         struct CompareStateAttributes
         {
             bool operator()(const osg::ref_ptr<osg::StateAttribute>& lhs,
- -                            const osg::ref_ptr<osg::StateAttribute>& rhs)
+                            const osg::ref_ptr<osg::StateAttribute>& rhs) const
         {
             return *lhs < *rhs;
         }
@@ -77,7 +77,7 @@ namespace osgDB {
         struct CompareStateSets
         {
             bool operator()(const osg::ref_ptr<osg::StateSet>& lhs,
- -                            const osg::ref_ptr<osg::StateSet>& rhs)
+                            const osg::ref_ptr<osg::StateSet>& rhs) const
         {
             return lhs->compare(*rhs, true) < 0;
         }

The whole file is attached.
Tim
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iD8DBQFHX4GPeDhWHdXrDRURAiDGAJ4kzhBpnLSM+OfHTGQCaCnzf3GGVwCdH//i
cMxss0cjKIO8C9gX3EOdpTU=
=Ehv7
-----END PGP SIGNATURE-----

Attachment: DatabasePager.tar
Description: Unix tar archive

_______________________________________________
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Reply via email to