commit 5e7d876f8bae477a97606afee93066849a798844
author Chris Wailes <chriswailes@google.com> Fri Jul 25 18:02:32 2014 -0700
committer Chris Wailes <chriswailes@google.com> Mon Aug 18 14:22:14 2014 -0700
tree 0f4438f5b887ddf6044824a1e1c8b4f8b789c46f
parent 5010f641d1df6bc3447646ca7ef837410fb9b3dc

Replaced android::Vector with std::vector.

Change-Id: I9bcf36d088d423246312d97e2a87a05e90f6617d

lib/ExecutionEngine/ELFObjectLoaderImpl.cpp

diff --git a/lib/ExecutionEngine/ELFObjectLoaderImpl.cpp b/lib/ExecutionEngine/ELFObjectLoaderImpl.cpp
index 6aeda00..8797ce1 100644
--- a/lib/ExecutionEngine/ELFObjectLoaderImpl.cpp
+++ b/lib/ExecutionEngine/ELFObjectLoaderImpl.cpp
@@ -181,7 +181,7 @@
 }
 
 bool
-ELFObjectLoaderImpl::getSymbolNameList(android::Vector<const char *>& pNameList,
+ELFObjectLoaderImpl::getSymbolNameList(std::vector<const char *>& pNameList,
                                        ObjectLoader::SymbolType pType) const {
   if (mSymTab == NULL) {
     return false;

lib/ExecutionEngine/ELFObjectLoaderImpl.h

diff --git a/lib/ExecutionEngine/ELFObjectLoaderImpl.h b/lib/ExecutionEngine/ELFObjectLoaderImpl.h
index 52719e7..8734558 100644
--- a/lib/ExecutionEngine/ELFObjectLoaderImpl.h
+++ b/lib/ExecutionEngine/ELFObjectLoaderImpl.h
@@ -52,7 +52,7 @@
 
   virtual size_t getSymbolSize(const char *pName) const;
 
-  virtual bool getSymbolNameList(android::Vector<const char *>& pNameList,
+  virtual bool getSymbolNameList(std::vector<const char *>& pNameList,
                                  ObjectLoader::SymbolType pType) const;
   ~ELFObjectLoaderImpl();
 };

lib/ExecutionEngine/ObjectLoader.cpp

diff --git a/lib/ExecutionEngine/ObjectLoader.cpp b/lib/ExecutionEngine/ObjectLoader.cpp
index ade11ab..79209d3 100644
--- a/lib/ExecutionEngine/ObjectLoader.cpp
+++ b/lib/ExecutionEngine/ObjectLoader.cpp
@@ -156,7 +156,7 @@
   return mImpl->getSymbolSize(pName);
 }
 
-bool ObjectLoader::getSymbolNameList(android::Vector<const char *>& pNameList,
+bool ObjectLoader::getSymbolNameList(std::vector<const char *>& pNameList,
                                      SymbolType pType) const {
   return mImpl->getSymbolNameList(pNameList, pType);
 }

lib/ExecutionEngine/ObjectLoaderImpl.h

diff --git a/lib/ExecutionEngine/ObjectLoaderImpl.h b/lib/ExecutionEngine/ObjectLoaderImpl.h
index a9de913..95d4ab4 100644
--- a/lib/ExecutionEngine/ObjectLoaderImpl.h
+++ b/lib/ExecutionEngine/ObjectLoaderImpl.h
@@ -18,12 +18,11 @@
 #define OBJECT_LOADER_IMPL_H
 
 #include <cstring>
+#include <vector>
 
 #include "bcc/ExecutionEngine/ObjectLoader.h"
 #include "bcc/Support/Log.h"
 
-#include <utils/Vector.h>
-
 namespace bcc {
 
 class SymbolResolverInterface;
@@ -42,7 +41,7 @@
 
   virtual size_t getSymbolSize(const char *pName) const = 0;
 
-  virtual bool getSymbolNameList(android::Vector<const char *>& pNameList,
+  virtual bool getSymbolNameList(std::vector<const char *>& pNameList,
                                  ObjectLoader::SymbolType pType) const = 0;
 
   virtual ~ObjectLoaderImpl() { }

lib/ExecutionEngine/SymbolResolverProxy.cpp

diff --git a/lib/ExecutionEngine/SymbolResolverProxy.cpp b/lib/ExecutionEngine/SymbolResolverProxy.cpp
index 5f3e7dc..8a9073c 100644
--- a/lib/ExecutionEngine/SymbolResolverProxy.cpp
+++ b/lib/ExecutionEngine/SymbolResolverProxy.cpp
@@ -20,12 +20,13 @@
 
 void *SymbolResolverProxy::getAddress(const char *pName) {
   // Search the address of the symbol by following the chain of resolvers.
-  for (size_t i = 0; i < mChain.size(); i++) {
-    void *addr = mChain[i]->getAddress(pName);
+  for (auto resolver : mChain) {
+    void *addr = resolver->getAddress(pName);
     if (addr != NULL) {
       return addr;
     }
   }
+
   // Symbol not found or there's no resolver containing in the chain.
   return NULL;
 }