summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
Diffstat (limited to 'sal')
-rw-r--r--sal/inc/pch/precompiled_sal.hxx1
-rw-r--r--sal/osl/all/debugbase.cxx2
-rw-r--r--sal/osl/w32/path_helper.hxx1
-rw-r--r--sal/osl/w32/procimpl.cxx2
-rw-r--r--sal/qa/osl/process/osl_process.cxx4
-rw-r--r--sal/rtl/bootstrap.cxx9
6 files changed, 4 insertions, 15 deletions
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index f26f2030b52d..2707686583e4 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 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;
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;
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()):