[Libreoffice-commits] .: sal/inc sal/Library_sal.mk sal/osl sal/Package_inc.mk sal/rtl
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 17 09:29:08 PST 2012
sal/Library_sal.mk | 1
sal/Package_inc.mk | 1
sal/inc/rtl/memory.h | 53 --------------------------------------------
sal/osl/all/compat.cxx | 32 ++++++++++++++++++++++++++
sal/rtl/source/memory.cxx | 55 ----------------------------------------------
5 files changed, 32 insertions(+), 110 deletions(-)
New commits:
commit 542ad7f1c5ac7794c42248ac13e9b33f84888490
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date: Sat Dec 8 11:35:00 2012 +0100
API CHANGE: Remove useless deprecated rtl/memory.h
Signed-off-by: Stephan Bergmann <sbergman at redhat.com>, adapted some function
definitions in sal/osl/all/compat.cxx to avoid "must return a value" warnings.
Change-Id: Iac156b004464018225bbfda24f0a234f9ebcb19f
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 5ea6b55..cae8219 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -119,7 +119,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/rtl/source/locale \
sal/rtl/source/logfile \
sal/rtl/source/math \
- sal/rtl/source/memory \
sal/rtl/source/random \
sal/rtl/source/rtl_process \
sal/rtl/source/strbuf \
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index 425db1d..15fb477 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/logfile.hxx,rtl/logfile.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/malformeduriexception.hxx,rtl/malformeduriexception.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.h,rtl/math.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.hxx,rtl/math.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/memory.h,rtl/memory.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/process.h,rtl/process.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/random.h,rtl/random.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ref.hxx,rtl/ref.hxx))
diff --git a/sal/inc/rtl/memory.h b/sal/inc/rtl/memory.h
deleted file mode 100644
index 25e2a73..0000000
--- a/sal/inc/rtl/memory.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#ifndef _RTL_MEMORY_H_
-#define _RTL_MEMORY_H_
-
-#include "sal/config.h"
-
-#include "sal/saldllapi.h"
-#include "sal/types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SAL_DEPRECATED("Use memset instead")
-SAL_DLLPUBLIC void SAL_CALL rtl_zeroMemory(void *Ptr, sal_Size Bytes);
-SAL_DEPRECATED("Use memset instead")
-SAL_DLLPUBLIC void SAL_CALL rtl_fillMemory(void *Ptr, sal_Size Bytes, sal_uInt8 Fill);
-SAL_DEPRECATED("Use memcpy instead")
-SAL_DLLPUBLIC void SAL_CALL rtl_copyMemory(void *Dst, const void *Src, sal_Size Bytes);
-SAL_DEPRECATED("Use memmove instead")
-SAL_DLLPUBLIC void SAL_CALL rtl_moveMemory(void *Dst, const void *Src, sal_Size Bytes);
-SAL_DEPRECATED("Use memcmp instead")
-SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_compareMemory(const void *MemA, const void *MemB, sal_Size Bytes);
-SAL_DEPRECATED("Use memchr instead")
-SAL_DLLPUBLIC void* SAL_CALL rtl_findInMemory(const void *MemA, sal_uInt8 ch, sal_Size Bytes);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /*_RTL_MEMORY_H_ */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
index fb8a1ec..f9c7129 100644
--- a/sal/osl/all/compat.cxx
+++ b/sal/osl/all/compat.cxx
@@ -37,6 +37,38 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_tryToAcquireSemaphore(void *) {
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
+SAL_DLLPUBLIC_EXPORT sal_Int32 SAL_CALL rtl_compareMemory(
+ void const *, void const *, sal_Size)
+{
+ for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_copyMemory(
+ void *, void const *, sal_Size)
+{
+ std::abort();
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_fillMemory(void *, sal_Size, sal_uInt8) {
+ std::abort();
+}
+
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL rtl_findInMemory(
+ void const *, sal_uInt8, sal_Size)
+{
+ for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_moveMemory(
+ void *, void const *, sal_Size)
+{
+ std::abort();
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_zeroMemory(void *, sal_Size) {
+ std::abort();
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/memory.cxx b/sal/rtl/source/memory.cxx
deleted file mode 100644
index 2db0c03..0000000
--- a/sal/rtl/source/memory.cxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <string.h>
-#include <rtl/memory.h>
-
-void SAL_CALL rtl_zeroMemory(void *Ptr, sal_Size Bytes)
-{
- memset(Ptr, 0, Bytes);
-}
-
-void SAL_CALL rtl_fillMemory(void *Ptr, sal_Size Bytes, sal_uInt8 Fill)
-{
- memset(Ptr, Fill, Bytes);
-}
-
-void SAL_CALL rtl_copyMemory(void *Dst, const void *Src, sal_Size Bytes)
-{
- memcpy(Dst, Src, Bytes);
-}
-
-void SAL_CALL rtl_moveMemory(void *Dst, const void *Src, sal_Size Bytes)
-{
- memmove(Dst, Src, Bytes);
-}
-
-sal_Int32 SAL_CALL rtl_compareMemory(const void *MemA, const void *MemB, sal_Size Bytes)
-{
- return memcmp(MemA, MemB, Bytes);
-}
-
-void* SAL_CALL rtl_findInMemory(const void *MemA, sal_uInt8 ch, sal_Size Bytes)
-{
- return const_cast< void * >(memchr(MemA, ch, Bytes));
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list