blob: c7f9d3cd3b204cfb3e76bcb8375afc23c260b572 (
plain) (
blame)
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
35
36
37
38
39
40
41
|
--- cc/paint/paint_op_writer.h.orig 2023-08-18 10:26:52 UTC
+++ cc/paint/paint_op_writer.h
@@ -114,10 +114,17 @@ class CC_PAINT_EXPORT PaintOpWriter {
// easier to keep serialized size calculation in sync with serialization and
// deserialization, and make it possible to allow dynamic sizing for some
// data types (see the specialized/overloaded functions).
+#if defined(__clang__) && (__clang_major__ >= 15)
template <typename T>
static constexpr size_t SerializedSize();
template <typename T>
static constexpr size_t SerializedSize(const T& data);
+#else
+ template <typename T>
+ static size_t SerializedSize();
+ template <typename T>
+ static size_t SerializedSize(const T& data);
+#endif
static size_t SerializedSize(const PaintImage& image);
static size_t SerializedSize(const PaintRecord& record);
static size_t SerializedSize(const SkHighContrastConfig& config);
@@ -386,12 +393,20 @@ constexpr size_t PaintOpWriter::SerializedSize<SkGainm
}
template <typename T>
+#if defined(__clang__) && (__clang_major__ >= 15)
constexpr size_t PaintOpWriter::SerializedSize() {
+#else
+size_t PaintOpWriter::SerializedSize() {
+#endif
static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>);
return SerializedSizeSimple<T>();
}
template <typename T>
+#if defined(__clang__) && (__clang_major__ >= 15)
constexpr size_t PaintOpWriter::SerializedSize(const T& data) {
+#else
+size_t PaintOpWriter::SerializedSize(const T& data) {
+#endif
return SerializedSizeSimple<T>();
}
|
