7
0
Files
nodejs-electron/thread_annotations-fix-build-with-system-abseil.patch
Dominik Heidler 52df3eda55 Accepting request 1005070 from home:dziobian:gulgul-ultron:19
Package Electron 20.
Please check if it works with element-desktop (my prior is that it should as upstream already uses this version)

OBS-URL: https://build.opensuse.org/request/show/1005070
OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=33
2022-09-21 09:00:14 +00:00

34 lines
1.0 KiB
Diff

--- a/base/thread_annotations.h 2022-06-21 21:52:33.363987695 +0200
+++ b/base/thread_annotations.h 2022-06-24 16:18:54.238568316 +0200
@@ -40,6 +40,8 @@
#include "base/dcheck_is_on.h"
#include "build/build_config.h"
+#include <absl/base/internal/thread_annotations.h>
+
#if defined(__clang__)
#define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
#else
@@ -227,21 +229,7 @@
// but the compiler cannot confirm that.
#define TS_UNCHECKED_READ(x) thread_safety_analysis::ts_unchecked_read(x)
-namespace thread_safety_analysis {
-
-// Takes a reference to a guarded data member, and returns an unguarded
-// reference.
-template <typename T>
-inline const T& ts_unchecked_read(const T& v) NO_THREAD_SAFETY_ANALYSIS {
- return v;
-}
-
-template <typename T>
-inline T& ts_unchecked_read(T& v) NO_THREAD_SAFETY_ANALYSIS {
- return v;
-}
-} // namespace thread_safety_analysis
// The above is imported as-is from abseil-cpp. The following Chromium-specific
// synonyms are added for Chromium concepts (SequenceChecker/ThreadChecker).