From 542ad7f1c5ac7794c42248ac13e9b33f84888490 Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Sat, 8 Dec 2012 11:35:00 +0100 Subject: API CHANGE: Remove useless deprecated rtl/memory.h Signed-off-by: Stephan Bergmann , adapted some function definitions in sal/osl/all/compat.cxx to avoid "must return a value" warnings. Change-Id: Iac156b004464018225bbfda24f0a234f9ebcb19f --- sal/rtl/source/memory.cxx | 55 ----------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 sal/rtl/source/memory.cxx (limited to 'sal/rtl') diff --git a/sal/rtl/source/memory.cxx b/sal/rtl/source/memory.cxx deleted file mode 100644 index 2db0c03366da..000000000000 --- 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 -#include - -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: */ -- cgit v1.2.3