summaryrefslogtreecommitdiffstats
path: root/runtime/base
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/base
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/base')
-rw-r--r--runtime/base/logging.cc2
-rw-r--r--runtime/base/timing_logger.cc2
2 files changed, 2 insertions, 2 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"