AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

stubs/mutex: Fix compilation by initializing variable in WrappedMutex class.

Browse Source 
This solves the following error in gcc:
explicitly defaulted function cannot be declared 'constexpr' because the implicit declaration is not 'constexpr'
This commit is contained in:
Biswapriyo Nath 2020-11-28 14:38:21 +05:30 committed by Adam Cozzette
parent 4a09d77a85
commit 19fb89416f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/google/protobuf/stubs/mutex.h
View File

@ -124,12 +124,12 @@ class GOOGLE_PROTOBUF_CAPABILITY("mutex") PROTOBUF_EXPORT WrappedMutex {
void AssertHeld() const {}
private:
#if defined(_MSC_VER)
CallOnceInitializedMutex<std::mutex> mu_;
#elif defined(GOOGLE_PROTOBUF_SUPPORT_WINDOWS_XP)
CallOnceInitializedMutex<CriticalSectionLock> mu_;
#if defined(GOOGLE_PROTOBUF_SUPPORT_WINDOWS_XP)
CallOnceInitializedMutex<CriticalSectionLock> mu_ {};
#elif defined(_MSC_VER)
CallOnceInitializedMutex<std::mutex> mu_ {};
#else
std::mutex mu_;
std::mutex mu_ {};
#endif
};