summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-11-05 23:22:27 -0800
committerBrian Carlstrom <bdc@google.com>2013-11-06 01:33:23 -0800
commita3d2718d1fac53210b2a311b1728409d6c8e7b9d (patch)
tree5f000437e67d2def425d0e25c3b53cef8bf2515b /runtime
parentf7ee11632e3dfda29d553d8962be9747d5ce6dfd (diff)
downloadart-a3d2718d1fac53210b2a311b1728409d6c8e7b9d.zip
art-a3d2718d1fac53210b2a311b1728409d6c8e7b9d.tar.gz
art-a3d2718d1fac53210b2a311b1728409d6c8e7b9d.tar.bz2
Change thread.h to thread-inl.h to pick up missing Thread::Currnet for debug build in master
Change-Id: I56a4dd18ec1c212f9dbb73b14c0c0623b23c87bd
Diffstat (limited to 'runtime')
-rw-r--r--runtime/base/logging.cc2
-rw-r--r--runtime/base/timing_logger.cc2
-rw-r--r--runtime/gc/collector/garbage_collector.cc2
-rw-r--r--runtime/gc/collector/partial_mark_sweep.cc2
-rw-r--r--runtime/gc/collector/sticky_mark_sweep.cc2
-rw-r--r--runtime/gc/space/large_object_space.cc2
-rw-r--r--runtime/native/dalvik_system_Zygote.cc2
-rw-r--r--runtime/thread_pool.cc2
-rw-r--r--runtime/well_known_classes.cc2
9 files changed, 9 insertions, 9 deletions
diff --git a/runtime/base/logging.cc b/runtime/base/logging.cc
index 7d54baf..3d842a0 100644
--- a/runtime/base/logging.cc
+++ b/runtime/base/logging.cc
@@ -18,7 +18,7 @@
#include "base/mutex.h"
#include "runtime.h"
-#include "thread.h"
+#include "thread-inl.h"
#include "utils.h"
namespace art {
diff --git a/runtime/base/timing_logger.cc b/runtime/base/timing_logger.cc
index 11dc542..6df1126 100644
--- a/runtime/base/timing_logger.cc
+++ b/runtime/base/timing_logger.cc
@@ -22,7 +22,7 @@
#include "timing_logger.h"
#include "base/logging.h"
-#include "thread.h"
+#include "thread-inl.h"
#include "base/stl_util.h"
#include "base/histogram-inl.h"
diff --git a/runtime/gc/collector/garbage_collector.cc b/runtime/gc/collector/garbage_collector.cc
index edfea94..6691cad 100644
--- a/runtime/gc/collector/garbage_collector.cc
+++ b/runtime/gc/collector/garbage_collector.cc
@@ -26,7 +26,7 @@
#include "gc/accounting/heap_bitmap.h"
#include "gc/space/large_object_space.h"
#include "gc/space/space-inl.h"
-#include "thread.h"
+#include "thread-inl.h"
#include "thread_list.h"
namespace art {
diff --git a/runtime/gc/collector/partial_mark_sweep.cc b/runtime/gc/collector/partial_mark_sweep.cc
index cc3cfe5..29367ce 100644
--- a/runtime/gc/collector/partial_mark_sweep.cc
+++ b/runtime/gc/collector/partial_mark_sweep.cc
@@ -19,7 +19,7 @@
#include "gc/heap.h"
#include "gc/space/space.h"
#include "partial_mark_sweep.h"
-#include "thread.h"
+#include "thread-inl.h"
namespace art {
namespace gc {
diff --git a/runtime/gc/collector/sticky_mark_sweep.cc b/runtime/gc/collector/sticky_mark_sweep.cc
index 19cbe6b..9f0bf33 100644
--- a/runtime/gc/collector/sticky_mark_sweep.cc
+++ b/runtime/gc/collector/sticky_mark_sweep.cc
@@ -18,7 +18,7 @@
#include "gc/space/large_object_space.h"
#include "gc/space/space.h"
#include "sticky_mark_sweep.h"
-#include "thread.h"
+#include "thread-inl.h"
namespace art {
namespace gc {
diff --git a/runtime/gc/space/large_object_space.cc b/runtime/gc/space/large_object_space.cc
index 1321b19..ab6e42b 100644
--- a/runtime/gc/space/large_object_space.cc
+++ b/runtime/gc/space/large_object_space.cc
@@ -22,7 +22,7 @@
#include "UniquePtr.h"
#include "image.h"
#include "os.h"
-#include "thread.h"
+#include "thread-inl.h"
#include "utils.h"
namespace art {
diff --git a/runtime/native/dalvik_system_Zygote.cc b/runtime/native/dalvik_system_Zygote.cc
index 2acacc9..d065ee4 100644
--- a/runtime/native/dalvik_system_Zygote.cc
+++ b/runtime/native/dalvik_system_Zygote.cc
@@ -35,7 +35,7 @@
#include "ScopedLocalRef.h"
#include "ScopedPrimitiveArray.h"
#include "ScopedUtfChars.h"
-#include "thread.h"
+#include "thread-inl.h"
#if defined(HAVE_PRCTL)
#include <sys/prctl.h>
diff --git a/runtime/thread_pool.cc b/runtime/thread_pool.cc
index 674ab9d..bb6c475 100644
--- a/runtime/thread_pool.cc
+++ b/runtime/thread_pool.cc
@@ -19,7 +19,7 @@
#include "base/casts.h"
#include "base/stl_util.h"
#include "runtime.h"
-#include "thread.h"
+#include "thread-inl.h"
namespace art {
diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc
index 8de020a..e3946f7 100644
--- a/runtime/well_known_classes.cc
+++ b/runtime/well_known_classes.cc
@@ -21,7 +21,7 @@
#include "base/logging.h"
#include "mirror/class.h"
#include "ScopedLocalRef.h"
-#include "thread.h"
+#include "thread-inl.h"
namespace art {