summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-02-27 12:29:32 -0800
committerBrian Carlstrom <bdc@google.com>2014-02-27 12:29:32 -0800
commita2806550cefb7c70781d8ee6279e6ad5769804cb (patch)
tree464c0dd8018379c65db92772644de5d426f2949d
parent95c2e440582f31f77a047797a5e2be4af53a8bfa (diff)
downloadart-a2806550cefb7c70781d8ee6279e6ad5769804cb.zip
art-a2806550cefb7c70781d8ee6279e6ad5769804cb.tar.gz
art-a2806550cefb7c70781d8ee6279e6ad5769804cb.tar.bz2
Remove some stray stringpiece.h includes
Bug: 13186058 Change-Id: I2cb313425864a5d4e988fcf71a99c60ad63c63fb
-rw-r--r--runtime/dex_file-inl.h1
-rw-r--r--runtime/dex_file.h1
-rw-r--r--runtime/gc/accounting/atomic_stack.h4
-rw-r--r--runtime/jni_internal.cc1
-rw-r--r--runtime/utils.h1
-rw-r--r--runtime/verifier/method_verifier.cc1
-rw-r--r--runtime/zip_archive.h1
7 files changed, 4 insertions, 6 deletions
diff --git a/runtime/dex_file-inl.h b/runtime/dex_file-inl.h
index a459308..e095c48 100644
--- a/runtime/dex_file-inl.h
+++ b/runtime/dex_file-inl.h
@@ -18,6 +18,7 @@
#define ART_RUNTIME_DEX_FILE_INL_H_
#include "base/logging.h"
+#include "base/stringpiece.h"
#include "dex_file.h"
#include "leb128.h"
#include "utils.h"
diff --git a/runtime/dex_file.h b/runtime/dex_file.h
index e9d18b5..70baeed 100644
--- a/runtime/dex_file.h
+++ b/runtime/dex_file.h
@@ -22,7 +22,6 @@
#include "base/logging.h"
#include "base/mutex.h"
-#include "base/stringpiece.h"
#include "globals.h"
#include "invoke_type.h"
#include "jni.h"
diff --git a/runtime/gc/accounting/atomic_stack.h b/runtime/gc/accounting/atomic_stack.h
index d6f3228..c79b586 100644
--- a/runtime/gc/accounting/atomic_stack.h
+++ b/runtime/gc/accounting/atomic_stack.h
@@ -17,6 +17,7 @@
#ifndef ART_RUNTIME_GC_ACCOUNTING_ATOMIC_STACK_H_
#define ART_RUNTIME_GC_ACCOUNTING_ATOMIC_STACK_H_
+#include <algorithm>
#include <string>
#include "atomic.h"
@@ -94,7 +95,8 @@ class AtomicStack {
if (kIsDebugBuild) {
// Sanity check that the memory is zero.
for (int32_t i = index; i < new_index; ++i) {
- DCHECK_EQ(begin_[i], static_cast<T>(0)) << "i=" << i << " index=" << index << " new_index=" << new_index;
+ DCHECK_EQ(begin_[i], static_cast<T>(0))
+ << "i=" << i << " index=" << index << " new_index=" << new_index;
}
}
return true;
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc
index 37fb2db..2db0f5f 100644
--- a/runtime/jni_internal.cc
+++ b/runtime/jni_internal.cc
@@ -26,7 +26,6 @@
#include "base/logging.h"
#include "base/mutex.h"
#include "base/stl_util.h"
-#include "base/stringpiece.h"
#include "class_linker-inl.h"
#include "dex_file-inl.h"
#include "gc/accounting/card_table-inl.h"
diff --git a/runtime/utils.h b/runtime/utils.h
index 0bb06de..bcbeb0e 100644
--- a/runtime/utils.h
+++ b/runtime/utils.h
@@ -23,7 +23,6 @@
#include <vector>
#include "base/logging.h"
-#include "base/stringpiece.h"
#include "base/stringprintf.h"
#include "globals.h"
#include "primitive.h"
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index ffa8b9e..4d11283 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -20,7 +20,6 @@
#include "base/logging.h"
#include "base/mutex-inl.h"
-#include "base/stringpiece.h"
#include "class_linker.h"
#include "compiler_callbacks.h"
#include "dex_file-inl.h"
diff --git a/runtime/zip_archive.h b/runtime/zip_archive.h
index 1f48e0a..2169fe0 100644
--- a/runtime/zip_archive.h
+++ b/runtime/zip_archive.h
@@ -22,7 +22,6 @@
#include <ziparchive/zip_archive.h>
#include "base/logging.h"
-#include "base/stringpiece.h"
#include "base/unix_file/random_access_file.h"
#include "globals.h"
#include "mem_map.h"