diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-02 21:30:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-02 22:12:07 +0200 |
| commit | ebd2bfa2e748d9efa4ee759f5b9003d9e470d752 (patch) | |
| tree | f892cf1cec026b077fbe991dc2ce27e6c315458d /o3tl/qa | |
| parent | new fix for fdo#47907 (diff) | |
| download | core-ebd2bfa2e748d9efa4ee759f5b9003d9e470d752.tar.gz core-ebd2bfa2e748d9efa4ee759f5b9003d9e470d752.zip | |
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
Diffstat (limited to 'o3tl/qa')
| -rw-r--r-- | o3tl/qa/test-sorted_vector.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
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); |