From dbba29e35c48b852af0957614e4a6fbac7ea874e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 8 Jun 2004 09:29:56 +0000
Subject: [PATCH] From Boris Bralo, reimplementation of dereference_less
 functor to use two input types, to attempt to avoid VC compile problems and
 redundent copies of ref_ptr<>.

---
 src/osgUtil/Simplifier.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/osgUtil/Simplifier.cpp b/src/osgUtil/Simplifier.cpp
index 383f15cb6..098336767 100644
--- a/src/osgUtil/Simplifier.cpp
+++ b/src/osgUtil/Simplifier.cpp
@@ -24,10 +24,10 @@
 using namespace osgUtil;
 
 
-template<class T>
 struct dereference_less
 {
-    inline bool operator() (const T& lhs,const T& rhs) const
+    template<class T, class U>
+    inline bool operator() (const T& lhs,const U& rhs) const
     {
         return *lhs < *rhs;
     }
@@ -190,12 +190,12 @@ public:
     void copyBackToGeometry();
 
     typedef std::vector<float>                                                                           FloatList;
-    typedef std::set<osg::ref_ptr<Edge>,dereference_less<osg::ref_ptr<Edge> > >                          EdgeSet;
-    typedef std::set< osg::ref_ptr<Point>,dereference_less<osg::ref_ptr<Point> > >                       PointSet;
+    typedef std::set<osg::ref_ptr<Edge>,dereference_less >                          EdgeSet;
+    typedef std::set< osg::ref_ptr<Point>,dereference_less >                       PointSet;
     typedef std::vector< osg::ref_ptr<Point> >                                                           PointList;
     typedef std::list< osg::ref_ptr<Triangle> >                                                          TriangleList;
     typedef std::set< osg::ref_ptr<Triangle> >                                                           TriangleSet;
-    typedef std::map< osg::ref_ptr<Triangle>, unsigned int, dereference_less<osg::ref_ptr<Triangle> > >  TriangleMap;
+    typedef std::map< osg::ref_ptr<Triangle>, unsigned int, dereference_less >  TriangleMap;
 
     struct Point : public osg::Referenced
     {