[Libreoffice-commits] core.git: include/basebmp

[David Tardon]

 include/basebmp/accessortraits.hxx |    4 +++-
 include/basebmp/metafunctions.hxx  |    9 ---------
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 9c1ff73b9ca12c5fea7147b6e887072b1ccbb406
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 6 16:56:06 2015 +0200

    use o3tl::project2nd
    
    Change-Id: I636453e8cab09ec5021acd2bb1f2937f1402dccc

diff --git a/include/basebmp/accessortraits.hxx b/include/basebmp/accessortraits.hxx
index b684984..eeabae0 100644
--- a/include/basebmp/accessortraits.hxx
+++ b/include/basebmp/accessortraits.hxx
@@ -24,6 +24,8 @@
 #include <basebmp/accessoradapters.hxx>
 #include <basebmp/metafunctions.hxx>
 
+#include <o3tl/compat_functional.hxx>
+
 #include <functional>
 
 namespace basebmp
@@ -82,7 +84,7 @@ template< class Accessor > struct AccessorTraits
     typedef typename Accessor::value_type           value_type;
 
     /// Retrieve stand-alone color lookup function for given Accessor type
-    typedef project2nd< Accessor, value_type > color_lookup;
+    typedef o3tl::project2nd< Accessor, value_type > color_lookup;
 
     /// Retrieve raw pixel data accessor for given Accessor type
     typedef Accessor                                raw_accessor;
diff --git a/include/basebmp/metafunctions.hxx b/include/basebmp/metafunctions.hxx
index 597e013..1f3f180 100644
--- a/include/basebmp/metafunctions.hxx
+++ b/include/basebmp/metafunctions.hxx
@@ -210,15 +210,6 @@ template< typename T > inline T shiftRight( T v, int shift )
     return shift > 0 ? v >> shift : v << (-shift);
 }
 
-
-
-/// Replace non-std project2nd from SGI extensions
-template< typename T1, typename T2 >
-struct project2nd : public std::binary_function<T1, T2, T2>
-{
-    T2 operator() (const T1&, const T2& v) const { return v; }
-};
-
 } // namespace basebmp
 
 #endif /* INCLUDED_BASEBMP_METAFUNCTIONS_HXX */