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

clang 6.0 compile fixes.

Browse Source
This commit is contained in:
Ralf Habacker 2016-06-20 08:14:53 +02:00 committed by Robert Osfield
parent 69929f596f
commit 7876c7915b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgDB/ObjectCache
View File

@ -72,7 +72,7 @@ class OSGDB_EXPORT ObjectCache : public osg::Referenced
class ClassComp { class ClassComp {
public: public:
bool operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs); bool operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) const;
}; };
typedef std::pair<osg::ref_ptr<osg::Object>, double > ObjectTimeStampPair; typedef std::pair<osg::ref_ptr<osg::Object>, double > ObjectTimeStampPair;

2
src/osgDB/ObjectCache.cpp
View File

@ -16,7 +16,7 @@
using namespace osgDB; using namespace osgDB;
bool ObjectCache::ClassComp::operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) bool ObjectCache::ClassComp::operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) const
{ {
return lhs.first < rhs.first || *lhs.second < *rhs.second; return lhs.first < rhs.first || *lhs.second < *rhs.second;
} }