From fec2a8fabe80bbc7a514b28c7bdd1c0a41fb9cbe Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 27 Jun 2008 19:40:52 +0000 Subject: [PATCH] Changed back to use an std::vector<> rather than a std::list for RequestQueue to avoid member template problems under Solaris. --- include/osgDB/DatabasePager | 2 +- src/osgDB/DatabasePager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/osgDB/DatabasePager b/include/osgDB/DatabasePager index 183309472..43eb86d2b 100644 --- a/include/osgDB/DatabasePager +++ b/include/osgDB/DatabasePager @@ -347,7 +347,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl struct RequestQueue : public osg::Referenced { - typedef std::list< osg::ref_ptr > RequestList; + typedef std::vector< osg::ref_ptr > RequestList; void sort(); diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp index 47dd8a884..730608d26 100644 --- a/src/osgDB/DatabasePager.cpp +++ b/src/osgDB/DatabasePager.cpp @@ -243,7 +243,7 @@ struct DatabasePager::SortFileRequestFunctor // void DatabasePager::RequestQueue::sort() { - _requestList.sort(SortFileRequestFunctor()); + std::sort(_requestList.begin(),_requestList.end(),SortFileRequestFunctor()); }