summaryrefslogtreecommitdiffstats
path: root/include/utils
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 /include/utils
parent156eb980918355dfc8a88ae4abf4df969acfbdef (diff)
downloadsystem_core-8d0c1a0316f583bc3835dbd7241bcffdb7fef7df.zip
system_core-8d0c1a0316f583bc3835dbd7241bcffdb7fef7df.tar.gz
system_core-8d0c1a0316f583bc3835dbd7241bcffdb7fef7df.tar.bz2
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 'include/utils')
-rw-r--r--include/utils/VectorImpl.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/include/utils/VectorImpl.h b/include/utils/VectorImpl.h
index b1224c6..c4ec2ff 100644
--- a/include/utils/VectorImpl.h
+++ b/include/utils/VectorImpl.h
@@ -104,6 +104,16 @@ protected:
virtual void do_splat(void* dest, const void* item, size_t num) const = 0;
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;
+
+ // take care of FBC...
+ virtual void reservedVectorImpl1();
+ virtual void reservedVectorImpl2();
+ virtual void reservedVectorImpl3();
+ virtual void reservedVectorImpl4();
+ virtual void reservedVectorImpl5();
+ virtual void reservedVectorImpl6();
+ virtual void reservedVectorImpl7();
+ virtual void reservedVectorImpl8();
private:
void* _grow(size_t where, size_t amount);
@@ -155,6 +165,16 @@ public:
protected:
virtual int do_compare(const void* lhs, const void* rhs) const = 0;
+ // take care of FBC...
+ virtual void reservedSortedVectorImpl1();
+ virtual void reservedSortedVectorImpl2();
+ virtual void reservedSortedVectorImpl3();
+ virtual void reservedSortedVectorImpl4();
+ virtual void reservedSortedVectorImpl5();
+ virtual void reservedSortedVectorImpl6();
+ virtual void reservedSortedVectorImpl7();
+ virtual void reservedSortedVectorImpl8();
+
private:
ssize_t _indexOrderOf(const void* item, size_t* order = 0) const;