From 402b5772d50203898b386e4c37759e34f78bb8e1 Mon Sep 17 00:00:00 2001 From: Mohamed Heikal Date: Thu, 15 Aug 2019 18:57:46 -0400 Subject: [PATCH] Fix order of export and capability macros on WrappedMutex clang-cl requires the order to be the opposite of what it currently is. It should not affect other compilers since this is the only compiler that has both macros defined. --- src/google/protobuf/stubs/mutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/stubs/mutex.h b/src/google/protobuf/stubs/mutex.h index a311889610..b222ff746d 100644 --- a/src/google/protobuf/stubs/mutex.h +++ b/src/google/protobuf/stubs/mutex.h @@ -93,7 +93,7 @@ class PROTOBUF_EXPORT CriticalSectionLock { // Mutex is a natural type to wrap. As both google and other organization have // specialized mutexes. gRPC also provides an injection mechanism for custom // mutexes. -class PROTOBUF_EXPORT GOOGLE_PROTOBUF_CAPABILITY("mutex") WrappedMutex { +class GOOGLE_PROTOBUF_CAPABILITY("mutex") PROTOBUF_EXPORT WrappedMutex { public: WrappedMutex() = default; void Lock() GOOGLE_PROTOBUF_ACQUIRE() { mu_.lock(); }