[Libreoffice-commits] core.git: connectivity/source sal/inc

[Arnaud Versini]

 connectivity/source/drivers/postgresql/pq_allocator.hxx |   11 -----------
 sal/inc/rtl/allocator.hxx                               |   13 -------------
 2 files changed, 24 deletions(-)

New commits:
commit 766170b61e26155715d1cd02f046658697293f5d
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Sun Feb 24 16:32:55 2013 +0100

    Removing useless STLPort specific code
    
    Change-Id: Id4c5907b2431130018bff434049d9e85ae689793
    Reviewed-on: https://gerrit.libreoffice.org/2365
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    Reviewed-by: Niko Rönkkö <ronkko at iki.fi>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx b/connectivity/source/drivers/postgresql/pq_allocator.hxx
index 78d1dfa..743a838 100644
--- a/connectivity/source/drivers/postgresql/pq_allocator.hxx
+++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx
@@ -206,15 +206,4 @@ inline bool operator!= (const Allocator<T>&, const Allocator<U>&) SAL_THROW(())
 
 } /* namespace sal */
 
-//######################################################
-/* REQUIRED BY STLPort (see stlport '_alloc.h'):
-   Hack for compilers that do not support member
-   template classes (e.g. MSVC 6) */
-    template<class T, class U>
-    inline pq_sdbc_driver::Allocator<U> & __stl_alloc_rebind (
-        pq_sdbc_driver::Allocator<T> & a, U const *)
-    {
-        return (pq_sdbc_driver::Allocator<U>&)(a);
-    }
-
 #endif /* _PQ_ALLOCATOR_ */
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index a70abff..9ceb3b7 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -170,19 +170,6 @@ inline bool operator!= (const Allocator<T>&, const Allocator<U>&) SAL_THROW(())
 
 } /* namespace rtl */
 
-/** REQUIRED BY STLPort (see stlport '_alloc.h'):
-    Hack for compilers that do not support member
-    template classes (e.g. MSVC 6)
-*/
-namespace _STL
-{
-    template<class T, class U>
-    inline ::rtl::Allocator<U> & __stl_alloc_rebind (::rtl::Allocator<T> & a, U const *)
-    {
-        return (::rtl::Allocator<U>&)(a);
-    }
-}
-
 /// @endcond
 
 #endif /* INCLUDED_RTL_ALLOCATOR_HXX */