[Libreoffice-commits] .: sal/inc sal/osl

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Nov 15 01:43:22 PST 2012


 sal/inc/osl/file.hxx    |    1 -
 sal/inc/rtl/byteseq.hxx |    1 -
 sal/inc/rtl/string.hxx  |    1 -
 sal/inc/rtl/ustring.hxx |    1 -
 sal/osl/unx/nlsupport.c |    1 -
 sal/osl/w32/pipe.c      |    1 -
 6 files changed, 6 deletions(-)

New commits:
commit 5e6401ffc58959394e2e06bd7ed68e6d03cae31f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 15 10:42:28 2012 +0100

    Drop obsolete includes of deprecated rtl/memory.h
    
    Change-Id: I532558f5502898e036e01d64faa854c68e7109c9

diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 6b9522d..e47b342 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -36,7 +36,6 @@
 #include <cassert>
 
 #include <osl/time.h>
-#include <rtl/memory.h>
 #include <rtl/ustring.hxx>
 
 #include <osl/file.h>
diff --git a/sal/inc/rtl/byteseq.hxx b/sal/inc/rtl/byteseq.hxx
index 852670e..6402c84 100644
--- a/sal/inc/rtl/byteseq.hxx
+++ b/sal/inc/rtl/byteseq.hxx
@@ -31,7 +31,6 @@
 #include <osl/interlck.h>
 #include <rtl/byteseq.h>
 #include <rtl/alloc.h>
-#include <rtl/memory.h>
 
 #if ! defined EXCEPTIONS_OFF
 #include <new>
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index a2aacb2..c7dd48e 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -35,7 +35,6 @@
 #include <ostream>
 
 #include <osl/diagnose.h>
-#include <rtl/memory.h>
 #include <rtl/textenc.h>
 #include <rtl/string.h>
 #include <rtl/stringutils.hxx>
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index bbd6e96..2489e3c 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -38,7 +38,6 @@
 #include <rtl/ustring.h>
 #include <rtl/string.hxx>
 #include <rtl/stringutils.hxx>
-#include <rtl/memory.h>
 #include <rtl/textenc.h>
 #include "sal/log.hxx"
 
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index da25a38..c276cb8 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -29,7 +29,6 @@
 #include <osl/nlsupport.h>
 #include <osl/diagnose.h>
 #include <osl/process.h>
-#include <rtl/memory.h>
 
 #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \
     defined(FREEBSD) || defined(MACOSX)  || defined(IOS) || defined(OPENBSD) || \
diff --git a/sal/osl/w32/pipe.c b/sal/osl/w32/pipe.c
index 3a9f110..1ddd776 100644
--- a/sal/osl/w32/pipe.c
+++ b/sal/osl/w32/pipe.c
@@ -40,7 +40,6 @@
 #include <osl/process.h>
 
 #include <rtl/alloc.h>
-#include <rtl/memory.h>
 
 #define PIPESYSTEM      "\\\\.\\pipe\\"
 #define PIPEPREFIX    "OSL_PIPE_"


More information about the Libreoffice-commits mailing list