diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 06:43:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 06:43:44 +0000 |
| commit | 76ea1c15849e2d2dcde381fe251b8ef3e3aab224 (patch) | |
| tree | cb9b6ac81fcbda7c72bd6df5453cec453bb695ba /sal/osl/w32 | |
| parent | 215e0293bcc51382acf87e016e31054f05747316 (diff) | |
INTEGRATION: CWS presfixes10 (1.3.38); FILE MERGED
2006/07/11 10:42:05 dbo 1.3.38.2: RESYNC: (1.3-1.4); FILE MERGED
2005/11/22 17:12:40 dbo 1.3.38.1: shifted internal allocator.hxx => rtl/allocator.hxx
Diffstat (limited to 'sal/osl/w32')
| -rw-r--r-- | sal/osl/w32/procimpl.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index f9732e000926..7d25d0b3f8cb 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: procimpl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2006-06-20 04:21:55 $ + * last change: $Author: rt $ $Date: 2006-07-26 07:43:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,8 +61,8 @@ #include "secimpl.h" #endif -#ifndef INCLUDED_SAL_INTERNAL_ALLOCATOR_HXX -#include "internal/allocator.hxx" +#ifndef INCLUDED_RTL_ALLOCATOR_HXX +#include "rtl/allocator.hxx" #endif #ifndef _OSL_FILE_HXX_ @@ -86,11 +86,11 @@ const rtl::OUString QUOTE = rtl::OUString::createFromAscii("\""); namespace /* private */ { //################################################# - typedef std::list<rtl::OUString, sal::Allocator<rtl::OUString> > string_container_t; + typedef std::list<rtl::OUString, rtl::Allocator<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; typedef std::pair<string_container_iterator_t, string_container_iterator_t> iterator_pair_t; - typedef std::vector<sal_Unicode, sal::Allocator<sal_Unicode> > environment_container_t; + typedef std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > environment_container_t; //################################################# /* Function object that compares two strings that are |