Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 4cbffcb

Browse files
livecodefraserlivecodeali
authored andcommitted
[[ Skia ]] Patch Skia to not use an unavailable C++11 feature
(cherry picked from commit 9f04864)
1 parent 19facc3 commit 4cbffcb

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

libskia/include/private/SkMutex.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ class SkBaseMutex {
4040

4141
class SkMutex : public SkBaseMutex {
4242
public:
43-
using SkBaseMutex::SkBaseMutex;
43+
// [[ Patch ]] Work around a missing C++11 feature in older GCC versions
44+
//using SkBaseMutex::SkBaseMutex;
45+
constexpr SkMutex()
46+
: SkBaseMutex() {}
47+
4448
~SkMutex() { fSemaphore.cleanup(); }
4549
};
4650

libskia/include/private/SkSemaphore.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ class SkBaseSemaphore {
5050

5151
class SkSemaphore : public SkBaseSemaphore {
5252
public:
53-
using SkBaseSemaphore::SkBaseSemaphore;
53+
// [[ Patch ]] Work around a missing C++11 feature in older GCC versions
54+
//using SkBaseSemaphore::SkBaseSemaphore;
55+
constexpr SkSemaphore(int count = 0)
56+
: SkBaseSemaphore(count) {}
57+
5458
~SkSemaphore() { this->cleanup(); }
5559
};
5660

0 commit comments

Comments
 (0)