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/qa/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/qa/osl')
| -rw-r--r-- | sal/qa/osl/process/osl_process.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 79e728324019..5a79ceb4b201 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; |