You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/12/10 09:43:27 UTC

svn commit: r1549785 - /openoffice/trunk/main/sal/inc/rtl/allocator.hxx

Author: hdu
Date: Tue Dec 10 08:43:26 2013
New Revision: 1549785

URL: http://svn.apache.org/r1549785
Log:
#i122362# remove stlport4 specific allocator

the allocator wouldn't be much of a problem since it is in its own
namespace "_STL", but that seems to confuse some MSVC versions

Modified:
    openoffice/trunk/main/sal/inc/rtl/allocator.hxx

Modified: openoffice/trunk/main/sal/inc/rtl/allocator.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/rtl/allocator.hxx?rev=1549785&r1=1549784&r2=1549785&view=diff
==============================================================================
--- openoffice/trunk/main/sal/inc/rtl/allocator.hxx (original)
+++ openoffice/trunk/main/sal/inc/rtl/allocator.hxx Tue Dec 10 08:43:26 2013
@@ -167,22 +167,5 @@ inline bool operator!= (const Allocator<
 
 } /* namespace rtl */
 
-//######################################################
-/** REQUIRED BY STLPort (see stlport '_alloc.h'): 
-    Hack for compilers that do not support member 
-    template classes (e.g. MSVC 6)
-
-    @internal
-*/
-namespace _STL
-{
-    /** @internal */
-    template<class T, class U>
-    inline ::rtl::Allocator<U> & __stl_alloc_rebind (::rtl::Allocator<T> & a, U const *)
-    {
-        return (::rtl::Allocator<U>&)(a);
-    }
-}
-
 #endif /* INCLUDED_RTL_ALLOCATOR_HXX */