[Libreoffice-commits] core.git: 2 commits - connectivity/source include/osl include/rtl odk/Package_odk_headers.mk sal/inc sal/osl sal/qa sal/rtl
Caolán McNamara
caolanm at redhat.com
Thu May 15 07:04:36 PDT 2014
connectivity/source/drivers/postgresql/pq_allocator.hxx | 190 ----------
connectivity/source/drivers/postgresql/pq_connection.cxx | 6
connectivity/source/drivers/postgresql/pq_connection.hxx | 9
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 6
connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx | 2
connectivity/source/drivers/postgresql/pq_statics.hxx | 7
connectivity/source/drivers/postgresql/pq_tools.cxx | 7
connectivity/source/drivers/postgresql/pq_tools.hxx | 5
connectivity/source/drivers/postgresql/pq_updateableresultset.hxx | 2
connectivity/source/drivers/postgresql/pq_xcontainer.hxx | 3
include/osl/diagnose.hxx | 4
include/rtl/allocator.hxx | 175 ---------
odk/Package_odk_headers.mk | 1
sal/inc/pch/precompiled_sal.hxx | 1
sal/osl/all/debugbase.cxx | 2
sal/osl/w32/path_helper.hxx | 1
sal/osl/w32/procimpl.cxx | 2
sal/qa/osl/process/osl_process.cxx | 4
sal/rtl/bootstrap.cxx | 9
19 files changed, 22 insertions(+), 414 deletions(-)
New commits:
commit 73d4d9a5834bf5eb92c2643e30bec9d307d00175
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 15 14:23:18 2014 +0100
Related: #i124896# remove obsoleted pq_allocator.hxx
Change-Id: I8a2b54c97f20e581b9703bf33dbba537c2f603c2
diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx b/connectivity/source/drivers/postgresql/pq_allocator.hxx
deleted file mode 100644
index e48d164..0000000
--- 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 95cc644..f222aa7 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 2675e53..4daa7a1 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 78f02e1..6ae2d0c 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 e4b373a..6dc53f0 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 df6d259..a8890a8 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 1a552d6..ff89568 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 039d4b5..aa392f7 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 ad97b0c..6afc1dd 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 f09f084..0800e09 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
commit a908e4eb41b83d051232f9e551e779e77c9a9c4f
Author: Herbert Dürr <hdu at apache.org>
Date: Thu May 15 09:59:27 2014 +0000
Resolves: #i124896# [API CHANGE] remove obsoleted rtl/allocator.hxx
remove obsoleted sal-module-internal custom STL allocator
The SAL module avoided the heavy dependency on the stlport4-libraries by using
a custom allocator for its internal STL containers. With stlport4 removed these
dependencies are gone and the SAL-internal custom allocator is obsoleted.
(cherry picked from commit c6e0325df6efce45dbb2616a32b7745c449c6c58)
Conflicts:
include/osl/diagnose.hxx
include/rtl/allocator.hxx
sal/osl/w32/procimpl.cxx
sal/qa/osl/process/osl_process.cxx
sal/rtl/bootstrap.cxx
sal/rtl/source/hash.cxx
sal/rtl/source/unload.cxx
Change-Id: I8515382828eda36aba1fec5f23e0f2a89aef7a33
diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx
index b46584a..04eb986 100644
--- a/include/osl/diagnose.hxx
+++ b/include/osl/diagnose.hxx
@@ -35,7 +35,6 @@
#include <osl/diagnose.h>
#include <osl/interlck.h>
#include <osl/mutex.hxx>
-#include <rtl/allocator.hxx>
#include <rtl/instance.hxx>
#include <sal/log.hxx>
#include <sal/saldllapi.h>
@@ -98,8 +97,7 @@ struct VoidPtrHash : ::std::unary_function<void const*, ::std::size_t> {
}
};
-typedef ::boost::unordered_set<void const*, VoidPtrHash, ::std::equal_to<void const*>,
- ::rtl::Allocator<void const*> > VoidPointerSet;
+typedef ::boost::unordered_set<void const*, VoidPtrHash, ::std::equal_to<void const*> > VoidPointerSet;
struct ObjectRegistryData {
ObjectRegistryData( ::std::type_info const& rTypeInfo )
diff --git a/include/rtl/allocator.hxx b/include/rtl/allocator.hxx
deleted file mode 100644
index 6f9152d..0000000
--- a/include/rtl/allocator.hxx
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_RTL_ALLOCATOR_HXX
-#define INCLUDED_RTL_ALLOCATOR_HXX
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-#include <rtl/alloc.h>
-#include <cstddef>
-
-/// @cond INTERNAL
-
-
-// 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 rtl {
-
-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 (SAL_UNUSED_PARAMETER 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 /* n */)
- {
- rtl_freeMemory(p);
- }
-
-
-#if HAVE_CXX11_PERFECT_FORWARDING && !defined(_LIBCPP_VERSION)
- template< typename... Args >
- void construct (pointer p, Args &&... value)
- {
- new ((void*)p)T(std::forward< Args >(value)...);
- }
-#else
- void construct (pointer p, const T& value)
- {
- new ((void*)p)T(value);
- }
-#endif
-
-
- void destroy (pointer p)
- {
- p->~T();
- (void)p; //MSVC2005 annoyingly warns this is unused
- }
-};
-
-
-// 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 ==(
- SAL_UNUSED_PARAMETER const Allocator<T>&,
- SAL_UNUSED_PARAMETER 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 rtl */
-
-/// @endcond
-
-#endif /* INCLUDED_RTL_ALLOCATOR_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk
index be6ff26..331af21 100644
--- a/odk/Package_odk_headers.mk
+++ b/odk/Package_odk_headers.mk
@@ -119,7 +119,6 @@ $(eval $(call gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\
osl/thread.hxx \
osl/time.h \
rtl/alloc.h \
- rtl/allocator.hxx \
rtl/bootstrap.h \
rtl/bootstrap.hxx \
rtl/byteseq.h \
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index f26f203..2707686 100644
--- a/sal/inc/pch/precompiled_sal.hxx
+++ b/sal/inc/pch/precompiled_sal.hxx
@@ -25,7 +25,6 @@
#include "osl/thread.hxx"
#include "osl/time.h"
#include "rtl/alloc.h"
-#include "rtl/allocator.hxx"
#include "rtl/bootstrap.h"
#include "rtl/bootstrap.hxx"
#include "rtl/character.hxx"
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 57f70d8..c2dc2b6 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -28,7 +28,7 @@
namespace {
-typedef std::vector<rtl::OString, rtl::Allocator<rtl::OString> > OStringVec;
+typedef std::vector<rtl::OString> OStringVec;
struct StaticDebugBaseAddressFilter
: rtl::StaticWithInit<OStringVec, StaticDebugBaseAddressFilter> {
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index 6092098..8087ac4 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -22,7 +22,6 @@
#include "path_helper.h"
#include <rtl/ustring.hxx>
-#include <rtl/allocator.hxx>
namespace osl
{
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 9f511e7..bccda26 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -36,7 +36,6 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include "secimpl.h"
-#include "rtl/allocator.hxx"
#include <osl/file.hxx>
#include <list>
@@ -54,7 +53,6 @@ const rtl::OUString QUOTE("\"");
namespace /* private */
{
-
typedef std::list<rtl::OUString> string_container_t;
typedef string_container_t::iterator string_container_iterator_t;
typedef string_container_t::const_iterator string_container_const_iterator_t;
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 79e7283..5a79ceb 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -44,8 +44,6 @@
#include <unistd.h>
#endif
-#include "rtl/allocator.hxx"
-
#include <iostream>
#include <fstream>
#include <vector>
@@ -88,7 +86,7 @@ inline ::rtl::OUString getExecutablePath( void )
//rtl::OUString CWD = getExecutablePath();
-typedef std::vector<std::string, rtl::Allocator<std::string> > string_container_t;
+typedef std::vector<std::string> string_container_t;
typedef string_container_t::const_iterator string_container_const_iter_t;
typedef string_container_t::iterator string_container_iter_t;
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 8e92f13..86f22c8 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -37,7 +37,6 @@
#include <rtl/instance.hxx>
#include <rtl/malformeduriexception.hxx>
#include <rtl/uri.hxx>
-#include "rtl/allocator.hxx"
#include <boost/noncopyable.hpp>
#include <boost/unordered_map.hpp>
@@ -132,10 +131,7 @@ struct rtl_bootstrap_NameValue
{}
};
-typedef std::list<
- rtl_bootstrap_NameValue,
- rtl::Allocator< rtl_bootstrap_NameValue >
-> NameValueList;
+typedef std::list<rtl_bootstrap_NameValue> NameValueList;
bool find(
NameValueList const & list, rtl::OUString const & key,
@@ -607,8 +603,7 @@ namespace {
struct bootstrap_map: private boost::noncopyable {
typedef boost::unordered_map<
rtl::OUString, Bootstrap_Impl *,
- rtl::OUStringHash, std::equal_to< rtl::OUString >,
- rtl::Allocator< OUString > > t;
+ rtl::OUStringHash, std::equal_to< rtl::OUString > > t;
// get and release must only be called properly synchronized via some mutex
// (e.g., osl::Mutex::getGlobalMutex()):
More information about the Libreoffice-commits
mailing list