Revert "Revert "sorted_vector: turn Find parameter into template""

This reverts commit 8291d41667b1a63d35bf818aaf9d75529e1f12f0.

Un-revert that, with a tweak: with the bizarre name lookup semantics
in C++, the proper way to refer to a template (as opposed to a template
instance) is by prefixing the name with its namespace, which does seem
to work with MSVC2008 & GCC 4.7; thanks to Stephan Bergmann for the hint.

Change-Id: Id9cccbe68fb3ce2dd070c4b3dbd21782c92170ca

2 files changed, 12 insertions, 13 deletions

diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/o3tl/inc/o3tl/sorted_vector.hxx
index 4d442dd590ae..90aacbf11ac7 100644
--- a/o3tl/inc/o3tl/sorted_vector.hxx
+++ b/o3tl/inc/o3tl/sorted_vector.hxx
@@ -27,12 +27,13 @@ struct find_unique;
     @tpl Compare comparison method
     @tpl Find   look up index of a Value in the array
 */
-template<class Value, class Compare = std::less<Value>,
-         class Find = find_unique<Value, Compare> >
+template<typename Value, typename Compare = std::less<Value>,
+     template<typename, typename> class Find = find_unique >
 class sorted_vector
     : private std::vector<Value>
 {
 private:
+    typedef Find<Value, Compare> Find_t;
     typedef typename std::vector<Value> base_t;
     typedef typename std::vector<Value>::iterator  iterator;
 public:
@@ -47,7 +48,7 @@ public:
 
     std::pair<const_iterator,bool> insert( const Value& x )
     {
-        std::pair<const_iterator, bool> const ret(Find()(begin(), end(), x));
+        std::pair<const_iterator, bool> const ret(Find_t()(begin(), end(), x));
         if (!ret.second)
         {
             const_iterator const it = base_t::insert(
@@ -59,7 +60,7 @@ public:
 
     size_type erase( const Value& x )
     {
-        std::pair<const_iterator, bool> const ret(Find()(begin(), end(), x));
+        std::pair<const_iterator, bool> const ret(Find_t()(begin(), end(), x));
         if (ret.second)
         {
             base_t::erase(begin_nonconst() + (ret.first - begin()));
@@ -129,7 +130,7 @@ public:
      */
     const_iterator find( const Value& x ) const
     {
-        std::pair<const_iterator, bool> const ret(Find()(begin(), end(), x));
+        std::pair<const_iterator, bool> const ret(Find_t()(begin(), end(), x));
         return (ret.second) ? ret.first : end();
     }
 
@@ -180,8 +181,8 @@ template <class T> struct less_ptr_to : public std::binary_function <T*,T*,bool>
 template<class Value, class Compare>
 struct find_unique
 {
-    typedef typename sorted_vector<Value, Compare, find_unique>
-                ::const_iterator const_iterator;
+    typedef typename sorted_vector<Value, Compare,
+            o3tl::find_unique> ::const_iterator const_iterator;
     std::pair<const_iterator, bool> operator()(
             const_iterator first, const_iterator last,
             Value const& v)
@@ -197,8 +198,8 @@ struct find_unique
 template<class Value, class Compare>
 struct find_partialorder_ptrequals
 {
-    typedef typename sorted_vector<Value, Compare, find_partialorder_ptrequals>
-                ::const_iterator const_iterator;
+    typedef typename sorted_vector<Value, Compare,
+            o3tl::find_partialorder_ptrequals>::const_iterator const_iterator;
     std::pair<const_iterator, bool> operator()(
             const_iterator first, const_iterator last,
             Value const& v)
diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx
index 1b321c91a2a4..8e9e719f2c1d 100644
--- a/o3tl/qa/test-sorted_vector.cxx
+++ b/o3tl/qa/test-sorted_vector.cxx
@@ -136,8 +136,7 @@ public:
     void testBasics_FindPtr()
     {
         o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent>,
-            o3tl::find_partialorder_ptrequals<SwContent*,
-                o3tl::less_ptr_to<SwContent> > > aVec;
+            o3tl::find_partialorder_ptrequals> aVec;
         SwContent *p1 = new SwContent(1);
         SwContent *p2 = new SwContent(2);
         SwContent *p2_2 = new SwContent(2);
@@ -195,8 +194,7 @@ public:
     void testErase_FindPtr()
     {
         o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent>,
-            o3tl::find_partialorder_ptrequals<SwContent*,
-                o3tl::less_ptr_to<SwContent> > > aVec;
+            o3tl::find_partialorder_ptrequals> aVec;
         SwContent *p1 = new SwContent(1);
         SwContent *p1_2 = new SwContent(1);
         SwContent *p1_3 = new SwContent(1);