diff options
-rw-r--r-- | connectivity/source/drivers/postgresql/pq_allocator.hxx | 6 | ||||
-rw-r--r-- | connectivity/source/drivers/postgresql/pq_common.hxx | 41 |
2 files changed, 2 insertions, 45 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx b/connectivity/source/drivers/postgresql/pq_allocator.hxx index fad9b035c5a7..f454bb6a7664 100644 --- a/connectivity/source/drivers/postgresql/pq_allocator.hxx +++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx @@ -59,8 +59,6 @@ #include <cstddef> #include "sal/types.h" -#include "pq_common.hxx" - /** jbu: This source has been copied from sal/inc/internal/allocator.hxx, because it is not a public interface. Thx a lot for figuring this out. @@ -153,14 +151,14 @@ public: are not enabled, e.g. GCC under Linux and it is in general not desired to compile sal with exceptions enabled. */ - pointer allocate (size_type n, const void* UNUSED(hint) = 0) + pointer allocate (size_type n, SAL_UNUSED_PARAMETER const void* = 0) { return reinterpret_cast<pointer>( rtl_allocateMemory(sal_uInt32(n * sizeof(T)))); } //----------------------------------------- - void deallocate (pointer p, size_type UNUSED(n)) + void deallocate (pointer p, SAL_UNUSED_PARAMETER size_type) { rtl_freeMemory(p); } diff --git a/connectivity/source/drivers/postgresql/pq_common.hxx b/connectivity/source/drivers/postgresql/pq_common.hxx deleted file mode 100644 index 68a973a41a22..000000000000 --- a/connectivity/source/drivers/postgresql/pq_common.hxx +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Major Contributor(s): - * [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> (initial developer) ] - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. - */ - -#ifndef _PQ_COMMON_ -#define _PQ_COMMON_ - -#ifdef UNUSED -#elif defined(__GNUC__) -# define UNUSED(x) UNUSED_ ## x __attribute__((unused)) -#elif defined(__LCLINT__) -# define UNUSED(x) /*@unused@*/ x -#else -# define UNUSED(x) x -#endif - -#endif /* _PQ_COMMON_ */ |