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

Unified Diff: net/base/dns_reloader.cc

Issue 9297010: Make it possible to use ThreadLocalStorage::Slot as a static without (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 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 | « base/tracked_objects.cc ('k') | ppapi/proxy/ppb_message_loop_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/dns_reloader.cc
diff --git a/net/base/dns_reloader.cc b/net/base/dns_reloader.cc
index ff79388a50cf319249c4ef045e89d24a3c21fa1b..2254f9afbafb2e6eb1abadc0cdb0b21d1cc70c20 100644
--- a/net/base/dns_reloader.cc
+++ b/net/base/dns_reloader.cc
@@ -93,15 +93,14 @@ class DnsReloader : public net::NetworkChangeNotifier::DNSObserver {
friend struct base::DefaultLazyInstanceTraits<DnsReloader>;
// We use thread local storage to identify which ReloadState to interact with.
- static base::ThreadLocalStorage::Slot tls_index_ ;
+ static base::ThreadLocalStorage::StaticSlot tls_index_;
DISALLOW_COPY_AND_ASSIGN(DnsReloader);
};
// A TLS slot to the ReloadState for the current thread.
// static
-base::ThreadLocalStorage::Slot DnsReloader::tls_index_(
- base::LINKER_INITIALIZED);
+base::ThreadLocalStorage::StaticSlot DnsReloader::tls_index_ = TLS_INITIALIZER;
base::LazyInstance<DnsReloader>::Leaky
g_dns_reloader = LAZY_INSTANCE_INITIALIZER;
« no previous file with comments | « base/tracked_objects.cc ('k') | ppapi/proxy/ppb_message_loop_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698