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 /include/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 'include/osl')
| -rw-r--r-- | include/osl/diagnose.hxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx index b46584a37dbd..04eb986282a7 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 ) |