summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2012-08-20 17:03:29 -0700
committerAlex Ray <aray@google.com>2013-07-30 13:57:00 -0700
commit8d0c1a0316f583bc3835dbd7241bcffdb7fef7df (patch)
tree98b0286299f4648ad417f53937041683b8ee1b52 /libs
parent156eb980918355dfc8a88ae4abf4df969acfbdef (diff)
downloadcore-8d0c1a0316f583bc3835dbd7241bcffdb7fef7df.tar.gz
core-8d0c1a0316f583bc3835dbd7241bcffdb7fef7df.tar.bz2
core-8d0c1a0316f583bc3835dbd7241bcffdb7fef7df.zip
put back the unused virtuals in Vector<>
some binaries are using these private APIs and broke (as they should!) with this change. Temporarily restore the virtuals to work around this. Bug: 6977550 Change-Id: I7c37f24b16e4d586b89205c493db5169cf87e024
Diffstat (limited to 'libs')
-rw-r--r--libs/utils/VectorImpl.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/libs/utils/VectorImpl.cpp b/libs/utils/VectorImpl.cpp
index 020ec15c9..385530519 100644
--- a/libs/utils/VectorImpl.cpp
+++ b/libs/utils/VectorImpl.cpp
@@ -494,6 +494,15 @@ void VectorImpl::_do_move_backward(void* dest, const void* from, size_t num) con
do_move_backward(dest, from, num);
}
+void VectorImpl::reservedVectorImpl1() { }
+void VectorImpl::reservedVectorImpl2() { }
+void VectorImpl::reservedVectorImpl3() { }
+void VectorImpl::reservedVectorImpl4() { }
+void VectorImpl::reservedVectorImpl5() { }
+void VectorImpl::reservedVectorImpl6() { }
+void VectorImpl::reservedVectorImpl7() { }
+void VectorImpl::reservedVectorImpl8() { }
+
/*****************************************************************************/
SortedVectorImpl::SortedVectorImpl(size_t itemSize, uint32_t flags)
@@ -609,6 +618,16 @@ ssize_t SortedVectorImpl::remove(const void* item)
return i;
}
+void SortedVectorImpl::reservedSortedVectorImpl1() { };
+void SortedVectorImpl::reservedSortedVectorImpl2() { };
+void SortedVectorImpl::reservedSortedVectorImpl3() { };
+void SortedVectorImpl::reservedSortedVectorImpl4() { };
+void SortedVectorImpl::reservedSortedVectorImpl5() { };
+void SortedVectorImpl::reservedSortedVectorImpl6() { };
+void SortedVectorImpl::reservedSortedVectorImpl7() { };
+void SortedVectorImpl::reservedSortedVectorImpl8() { };
+
+
/*****************************************************************************/
}; // namespace android