diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-05-15 09:59:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-15 15:03:49 +0100 |
| commit | a908e4eb41b83d051232f9e551e779e77c9a9c4f (patch) | |
| tree | 90b6b4a2b3ae6056321f725aa45be1b4d6d06073 /sal/osl | |
| parent | b79b8d2c613588f6a0175160c7f0a1161ea84b35 (diff) | |
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
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/all/debugbase.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/w32/path_helper.hxx | 1 | ||||
| -rw-r--r-- | sal/osl/w32/procimpl.cxx | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index 57f70d8c9bc8..c2dc2b68f74e 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 6092098a560e..8087ac445887 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 9f511e7053d8..bccda26b49d7 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; |