summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/atomic_sequence_num.h1
-rw-r--r--base/timer.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/base/atomic_sequence_num.h b/base/atomic_sequence_num.h
index 2da29e8..26bea4e 100644
--- a/base/atomic_sequence_num.h
+++ b/base/atomic_sequence_num.h
@@ -13,6 +13,7 @@ namespace base {
class AtomicSequenceNumber {
public:
AtomicSequenceNumber() : seq_(0) { }
+ explicit AtomicSequenceNumber(base::LinkerInitialized x) { /* seq_ is 0 */ }
int GetNext() {
return static_cast<int>(
diff --git a/base/timer.cc b/base/timer.cc
index 2091906..7de55c7 100644
--- a/base/timer.cc
+++ b/base/timer.cc
@@ -18,7 +18,7 @@ namespace base {
// A sequence number for all allocated times (used to break ties when
// comparing times in the TimerManager, and assure FIFO execution sequence).
-static AtomicSequenceNumber timer_id_counter_;
+static AtomicSequenceNumber timer_id_counter_(base::LINKER_INITIALIZED);
//-----------------------------------------------------------------------------
// Timer