From 2d6827ba03975e80c41d7a734842ab734b6a3288 Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Wed, 3 Dec 2014 06:14:55 +0100 Subject: [PATCH] libutils: Properly #ifdef NEEDS_VECTORIMPL_SYMBOLS * Compile error might occur otherwise Change-Id: I982e5f72ea4e84594e415394cceed44f90045526 (cherry picked from commit 1ff785445828a9a40138d67e1de2a4fbae9680e9) --- include/utils/VectorImpl.h | 4 ++-- libutils/VectorImpl.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/utils/VectorImpl.h b/include/utils/VectorImpl.h index cab95bef8d1..88c3a05d0bf 100644 --- a/include/utils/VectorImpl.h +++ b/include/utils/VectorImpl.h @@ -106,7 +106,7 @@ class VectorImpl virtual void do_move_forward(void* dest, const void* from, size_t num) const = 0; virtual void do_move_backward(void* dest, const void* from, size_t num) const = 0; -#if NEEDS_VECTORIMPL_SYMBOLS +#ifdef NEEDS_VECTORIMPL_SYMBOLS // take care of FBC... virtual void reservedVectorImpl1(); virtual void reservedVectorImpl2(); @@ -168,7 +168,7 @@ class SortedVectorImpl : public VectorImpl protected: virtual int do_compare(const void* lhs, const void* rhs) const = 0; -#if NEEDS_VECTORIMPL_SYMBOLS +#ifdef NEEDS_VECTORIMPL_SYMBOLS // take care of FBC... virtual void reservedSortedVectorImpl1(); virtual void reservedSortedVectorImpl2(); diff --git a/libutils/VectorImpl.cpp b/libutils/VectorImpl.cpp index e35766c9098..f5141a65f48 100644 --- a/libutils/VectorImpl.cpp +++ b/libutils/VectorImpl.cpp @@ -518,7 +518,7 @@ void VectorImpl::_do_move_backward(void* dest, const void* from, size_t num) con do_move_backward(dest, from, num); } -#if NEEDS_VECTORIMPL_SYMBOLS +#ifdef NEEDS_VECTORIMPL_SYMBOLS void VectorImpl::reservedVectorImpl1() { } void VectorImpl::reservedVectorImpl2() { } void VectorImpl::reservedVectorImpl3() { } @@ -644,7 +644,7 @@ ssize_t SortedVectorImpl::remove(const void* item) return i; } -#if NEEDS_VECTORIMPL_SYMBOLS +#ifdef NEEDS_VECTORIMPL_SYMBOLS void SortedVectorImpl::reservedSortedVectorImpl1() { }; void SortedVectorImpl::reservedSortedVectorImpl2() { }; void SortedVectorImpl::reservedSortedVectorImpl3() { };