Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: runtime/vm/simulator_arm.cc

Issue 287933002: Fix Android build warnings (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/os_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/simulator_arm.cc
diff --git a/runtime/vm/simulator_arm.cc b/runtime/vm/simulator_arm.cc
index 7d11cdd15b0543ddf5061344c3f315617fc3abd6..2c9c78f58b47fe4c41ee2bf36521385e33a69863 100644
--- a/runtime/vm/simulator_arm.cc
+++ b/runtime/vm/simulator_arm.cc
@@ -708,11 +708,11 @@ bool Simulator::HasExclusiveAccessAndOpen(uword addr) {
if (exclusive_access_state_[i].addr == addr) {
result = true;
}
- exclusive_access_state_[i].addr = NULL;
+ exclusive_access_state_[i].addr = static_cast<uword>(NULL);
continue;
}
if (exclusive_access_state_[i].addr == addr) {
- exclusive_access_state_[i].addr = NULL;
+ exclusive_access_state_[i].addr = static_cast<uword>(NULL);
}
}
return result;
@@ -724,7 +724,7 @@ void Simulator::InitOnce() {
exclusive_access_lock_ = new Mutex();
for (int i = 0; i < kNumAddressTags; i++) {
exclusive_access_state_[i].isolate = NULL;
- exclusive_access_state_[i].addr = NULL;
+ exclusive_access_state_[i].addr = static_cast<uword>(NULL);
}
next_address_tag_ = 0;
}
@@ -1106,7 +1106,7 @@ void Simulator::ClearExclusive() {
// This lock is initialized in Simulator::InitOnce().
MutexLocker ml(exclusive_access_lock_);
// Set exclusive access to open state for this isolate.
- HasExclusiveAccessAndOpen(NULL);
+ HasExclusiveAccessAndOpen(static_cast<uword>(NULL));
}
« no previous file with comments | « runtime/vm/os_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698