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/rtl/bootstrap.cxx | |
| 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/rtl/bootstrap.cxx')
| -rw-r--r-- | sal/rtl/bootstrap.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 8e92f13ade60..86f22c823e8b 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()): |