Related: #i124896# remove obsoleted pq_allocator.hxx

Change-Id: I8a2b54c97f20e581b9703bf33dbba537c2f603c2

10 files changed, 17 insertions, 220 deletions

diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx b/connectivity/source/drivers/postgresql/pq_allocator.hxx
deleted file mode 100644
index e48d164734b6..000000000000
--- a/connectivity/source/drivers/postgresql/pq_allocator.hxx
+++ /dev/null
@@ -1,190 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- *  Effective License of whole file:
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
- *
- *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
- *
- *    The Contents of this file are made available subject to the terms of
- *    the GNU Lesser General Public License Version 2.1
- *
- *    Copyright: 2002 by Sun Microsystems, Inc.
- *
- *  All parts contributed on or after August 2011:
- *
- *    This Source Code Form is subject to the terms of the Mozilla Public
- *    License, v. 2.0. If a copy of the MPL was not distributed with this
- *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- ************************************************************************/
-
-#ifndef _PQ_ALLOCATOR_
-#define _PQ_ALLOCATOR_
-
-#include <cstddef>
-#include "sal/types.h"
-
-/** jbu: This source has been copied from sal/inc/internal/allocator.hxx,
-         because it is not a public interface. Thx a lot for figuring this
-         out.
- */
-
-
-// This is no general purpose STL allocator but one
-// necessary to use STL for some implementation but
-// avoid linking sal against the STLPort library!!!
-// For more information on when and how to define a
-// custom stl allocator have a look at Scott Meyers:
-// "Effective STL", Nicolai M. Josuttis:
-// "The C++ Standard Library - A Tutorial and Reference"
-// and at http://www.josuttis.com/cppcode/allocator.html
-
-namespace pq_sdbc_driver {
-
-template<class T>
-class Allocator
-{
-public:
-    typedef T value_type;
-    typedef T* pointer;
-    typedef const T* const_pointer;
-    typedef T& reference;
-    typedef const T& const_reference;
-    typedef ::std::size_t size_type;
-    typedef ::std::ptrdiff_t difference_type;
-
-
-    template<class U>
-    struct rebind
-    {
-        typedef Allocator<U> other;
-    };
-
-
-    pointer address (reference value) const
-    {
-        return &value;
-    }
-
-
-    const_pointer address (const_reference value) const
-    {
-        return &value;
-    }
-
-
-    Allocator() SAL_THROW(())
-    {}
-
-
-    template<class U>
-    Allocator (const Allocator<U>&) SAL_THROW(())
-    {}
-
-
-    Allocator(const Allocator&) SAL_THROW(())
-    {}
-
-
-    ~Allocator() SAL_THROW(())
-    {}
-
-
-    size_type max_size() const SAL_THROW(())
-    {
-        return size_type(-1)/sizeof(T);
-    }
-
-
-    /* Normally the code for allocate should
-       throw a std::bad_alloc exception if the
-       requested memory could not be allocated:
-       (C++ standard 20.4.1.1):
-
-       pointer allocate (size_type n, const void* hint = 0)
-       {
-         pointer p = reinterpret_cast<pointer>(
-             rtl_allocateMemory(sal_uInt32(n * sizeof(T))));
-
-         if (NULL == p)
-             throw ::std::bad_alloc();
-
-         return p;
-       }
-
-       but some compilers do not compile it if exceptions
-       are not enabled, e.g. GCC under Linux and it is
-       in general not desired to compile sal with exceptions
-       enabled. */
-    pointer allocate (size_type n, SAL_UNUSED_PARAMETER const void* = 0)
-    {
-        return reinterpret_cast<pointer>(
-            rtl_allocateMemory(sal_uInt32(n * sizeof(T))));
-    }
-
-
-    void deallocate (pointer p, SAL_UNUSED_PARAMETER size_type)
-    {
-        rtl_freeMemory(p);
-    }
-
-
-    void construct (pointer p, const T& value)
-    {
-        new ((void*)p)T(value);
-    }
-
-    // LEM: GNU libstdc++ vectors expect this one to exist,
-    // at least if one intends to create vectors by giving
-    // only a size and no initialising value.
-
-    void construct (pointer p)
-    {
-        new ((void*)p)T;
-    }
-
-
-    void destroy (pointer p)
-    {
-        p->~T();
-#ifdef _MSC_VER
-        (void) p; // spurious warning C4100: 'p': unreferenced formal parameter
-#endif
-    }
-};
-
-
-// Custom STL allocators must be stateless (see
-// references above) that's why the operators below
-// return always true or false
-template<class T, class U>
-inline bool operator== (const Allocator<T>&, const Allocator<U>&) SAL_THROW(())
-{
-    return true;
-}
-
-template<class T, class U>
-inline bool operator!= (const Allocator<T>&, const Allocator<U>&) SAL_THROW(())
-{
-    return false;
-}
-
-} /* namespace sal */
-
-#endif /* _PQ_ALLOCATOR_ */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 95cc644da51d..f222aa7822f8 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -210,11 +210,9 @@ Connection::~Connection()
         m_settings.logFile = 0;
     }
 }
-typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XCloseable > ,
-    ::pq_sdbc_driver::Allocator < ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XCloseable > > > CloseableList;
+typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XCloseable > > CloseableList;
 
-typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > ,
-    ::pq_sdbc_driver::Allocator < ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > > > DisposeableList;
+typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > > DisposeableList;
 
 void Connection::close() throw ( SQLException, RuntimeException, std::exception )
 {
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index 2675e5323c30..4daa7a1c72f6 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -59,7 +59,6 @@
 #include <cppuhelper/compbase6.hxx>
 
 #include <libpq-fe.h>
-#include "pq_allocator.hxx"
 
 namespace pq_sdbc_driver
 {
@@ -150,10 +149,9 @@ typedef ::boost::unordered_map<
     ::rtl::ByteSequence,
     ::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >,
     HashByteSequence,
-    ::std::equal_to< ::rtl::ByteSequence >,
-    Allocator< std::pair< const ::rtl::ByteSequence,::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable > > >
+    ::std::equal_to< ::rtl::ByteSequence >
 > WeakHashMap;
-typedef ::std::vector< OString, Allocator< OString > > OStringVector;
+typedef ::std::vector< OString > OStringVector;
 
 
 
@@ -162,8 +160,7 @@ typedef ::boost::unordered_map
     const sal_Int32,
     OUString,
     ::boost::hash< sal_Int32 >,
-    ::std::equal_to< sal_Int32 >,
-    Allocator< ::std::pair< sal_Int32, OUString > >
+    ::std::equal_to< sal_Int32 >
 > Int2StringMap;
 
 class Connection : public ConnectionBase
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 78f02e106fdb..6ae2d0c71c9c 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -102,8 +102,7 @@ namespace pq_sdbc_driver
 typedef
 std::vector
 <
-    com::sun::star::uno::Sequence< com::sun::star::uno::Any >,
-    Allocator< com::sun::star::uno::Sequence< com::sun::star::uno::Any > >
+    com::sun::star::uno::Sequence< com::sun::star::uno::Any >
 > SequenceAnyVector;
 
 
@@ -1419,8 +1418,7 @@ typedef ::boost::unordered_map
     sal_Int32,
     DatabaseTypeDescription,
     ::boost::hash< sal_Int32 >,
-    ::std::equal_to< sal_Int32 >,
-    Allocator< ::std::pair< sal_Int32, DatabaseTypeDescription > >
+    ::std::equal_to< sal_Int32 >
 > Oid2DatabaseTypeDescriptionMap;
 
 static void columnMetaData2DatabaseTypeDescription(
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
index e4b373aa6c97..6dc53f0fbc4e 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
@@ -61,7 +61,7 @@ struct ColDesc
 
 class ResultSet;
 
-typedef std::vector< ColDesc, Allocator< ColDesc > > ColDescVector;
+typedef std::vector< ColDesc > ColDescVector;
 
 
 class ResultSetMetaData :
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index df6d25931d82..a8890a811399 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -46,8 +46,6 @@
 
 #include <cppuhelper/propshlp.hxx>
 
-#include "pq_allocator.hxx"
-
 namespace pq_sdbc_driver
 {
 
@@ -94,7 +92,7 @@ struct ColumnMetaData
     bool isSigned;
 };
 
-typedef std::vector< ColumnMetaData, Allocator< ColumnMetaData > > ColumnMetaDataVector;
+typedef std::vector< ColumnMetaData > ColumnMetaDataVector;
 
 struct TypeDetails
 {
@@ -110,8 +108,7 @@ typedef ::boost::unordered_map
    OUString,
    sal_Int32,
    OUStringHash,
-   ::std::equal_to< OUString >,
-   Allocator< ::std::pair< const OUString , sal_Int32 > >
+   ::std::equal_to< OUString >
 > BaseTypeMap;
 
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 1a552d6135e7..ff89568e214e 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -566,7 +566,7 @@ void splitConcatenatedIdentifier( const OUString & source, OUString *first, OUSt
     }
 }
 
-typedef std::vector< sal_Int32 , Allocator< sal_Int32 > > IntVector;
+typedef std::vector< sal_Int32 > IntVector;
 
 
 OUString array2String( const com::sun::star::uno::Sequence< Any > &seq )
@@ -601,8 +601,7 @@ OUString array2String( const com::sun::star::uno::Sequence< Any > &seq )
 typedef
 std::vector
 <
-    com::sun::star::uno::Any,
-    Allocator< com::sun::star::uno::Any >
+    com::sun::star::uno::Any
 > AnyVector;
 
 com::sun::star::uno::Sequence< Any > parseArray( const OUString & str ) throw( SQLException )
@@ -873,7 +872,7 @@ com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const OUString & str
         if ( str.iterateCodePoints(&start, 0) == L'}' )
             return ret;
 
-        std::vector< sal_Int32, Allocator< sal_Int32 > > vec;
+        std::vector< sal_Int32 > vec;
         do
         {
             OUString digits;
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx
index 039d4b52cca1..aa392f75865b 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -128,8 +128,7 @@ typedef ::boost::unordered_map
     OString,
     OString,
     OStringHash,
-    ::std::equal_to< OString >,
-    Allocator< ::std::pair< OString, OString > >
+    ::std::equal_to< OString >
 > String2StringMap;
 
 OUString querySingleValue(
@@ -165,7 +164,7 @@ public:
     void executeUpdate( const OUString & sql );
 };
 
-template < typename T, typename Allocator > com::sun::star::uno::Sequence<T> sequence_of_vector ( const std::vector<T, Allocator> &vec )
+template < typename T > com::sun::star::uno::Sequence<T> sequence_of_vector ( const std::vector<T> &vec )
 {
     if ( vec.empty() )
         return com::sun::star::uno::Sequence<T>();
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
index ad97b0c36140..6afc1dd3da08 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
@@ -55,7 +55,7 @@ struct UpdateableField
     bool    isTouched;
 };
 
-typedef ::std::vector< UpdateableField , Allocator< UpdateableField > > UpdateableFieldVector;
+typedef ::std::vector< UpdateableField > UpdateableFieldVector;
 
 class UpdateableResultSet :
         public SequenceResultSet,
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
index f09f084126ef..0800e09735ea 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
@@ -91,8 +91,7 @@ typedef ::boost::unordered_map
    OUString,
    sal_Int32,
    OUStringHash,
-   ::std::equal_to< OUString >,
-   Allocator< ::std::pair< const OUString , sal_Int32 > >
+   ::std::equal_to< OUString >
 > String2IntMap;
 
 typedef ::cppu::WeakComponentImplHelper8