diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-08-01 14:41:43 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-08-01 14:59:10 +0200 |
commit | 8291d41667b1a63d35bf818aaf9d75529e1f12f0 (patch) | |
tree | f1464de3451cd79a5cc5837a5b028e580fe1b3b1 /sw/source/filter/html/htmlfly.hxx | |
parent | 7e579295c8c07998d7e077fa7e1db24745726e5f (diff) |
Revert "sorted_vector: turn Find parameter into template"
This reverts commit 3e3acee762fac71f7356ed1305a64e0278278081.
It was a nice idea, but C++ is not yet ready for it; with the travesty
of parametric polymorphism in C++ the find_unique inside the definition
of find_unique actually refers to find_unique<Value, Compare>, so there
is no way to actually refer to template<Value, Compare> find_unique
inside its definition. Thanks to Luboš Luňák for explaining
the problem to me. Somehow this does work in GCC 4.7 even with
-std=c++98, likely by accident.
Diffstat (limited to 'sw/source/filter/html/htmlfly.hxx')
-rw-r--r-- | sw/source/filter/html/htmlfly.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 8184d5cd140b..19b14e09153a 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -130,7 +130,8 @@ public: class SwHTMLPosFlyFrms : public o3tl::sorted_vector<SwHTMLPosFlyFrm*, o3tl::less_ptr_to<SwHTMLPosFlyFrm>, - o3tl::find_partialorder_ptrequals> + o3tl::find_partialorder_ptrequals<SwHTMLPosFlyFrm*, + o3tl::less_ptr_to<SwHTMLPosFlyFrm> > > {}; #endif |