blob: 7c787eab9d92ab84baac2ac1ede2c07431b5d85c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
description: gcc 6 does not provide a typedef for atomic<uint32_t>
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/platform/heap/gc_info.cc
+++ b/third_party/blink/renderer/platform/heap/gc_info.cc
@@ -51,7 +51,7 @@ void GCInfoTable::CreateGlobalTable() {
uint32_t GCInfoTable::EnsureGCInfoIndex(
const GCInfo* gc_info,
- std::atomic_uint32_t* gc_info_index_slot) {
+ std::atomic<uint32_t>* gc_info_index_slot) {
DCHECK(gc_info);
DCHECK(gc_info_index_slot);
--- a/third_party/blink/renderer/platform/heap/gc_info.h
+++ b/third_party/blink/renderer/platform/heap/gc_info.h
@@ -72,7 +72,7 @@ class PLATFORM_EXPORT GCInfoTable {
return info;
}
- uint32_t EnsureGCInfoIndex(const GCInfo*, std::atomic_uint32_t*);
+ uint32_t EnsureGCInfoIndex(const GCInfo*, std::atomic<uint32_t>*);
uint32_t GcInfoIndex() { return current_index_; }
@@ -117,7 +117,7 @@ struct GCInfoAtBaseType {
};
// This is more complicated than using threadsafe initialization, but this
// is instantiated many times (once for every GC type).
- static std::atomic_uint32_t gc_info_index{0};
+ static std::atomic<uint32_t> gc_info_index{0};
uint32_t index = gc_info_index.load(std::memory_order_acquire);
if (!index)
index = GCInfoTable::Get().EnsureGCInfoIndex(&kGcInfo, &gc_info_index);
|