organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-20185 Remove U_USER_ATOMICS_H, U_USER_MUTEX_H, U_USER_MUTEX_CPP

Browse source
This commit is contained in:
Andy Heninger 2018-10-31 14:30:58 -07:00
parent f38c928960
commit 776b9d7f2b
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
icu4c/source/common/umutex.cpp
View file

@ -36,11 +36,12 @@ static UMutex globalMutex = U_MUTEX_INITIALIZER;
*/
#if defined(U_USER_MUTEX_CPP)
// Build time user mutex hook: #include "U_USER_MUTEX_CPP"
#include U_MUTEX_XSTR(U_USER_MUTEX_CPP)
// Support for including an alternate implementation of mutexes has been withdrawn.
// See issue ICU-20185.
#error U_USER_MUTEX_CPP not supported
#endif
#elif U_HAVE_STD_MUTEX
#if U_HAVE_STD_MUTEX
// C++11 std::mutex based implementation of ICU mutex wrappers.
//

25
icu4c/source/common/umutex.h
View file

@ -35,24 +35,19 @@ U_NAMESPACE_BEGIN
struct UInitOnce;
U_NAMESPACE_END
// Stringify macros, to allow #include of user supplied atomic & mutex files.
#define U_MUTEX_STR(s) #s
#define U_MUTEX_XSTR(s) U_MUTEX_STR(s)
/****************************************************************************
*
* Low Level Atomic Operations.
* Compiler dependent. Not operating system dependent.
*
****************************************************************************/
#if defined (U_USER_ATOMICS_H)
#include U_MUTEX_XSTR(U_USER_ATOMICS_H)
#if defined(U_USER_ATOMICS_H)
// Support for including an alternate implementation of atomic operations has been withdrawn.
// See issue ICU-20185.
#error U_USER_ATOMICS not supported
#endif
// TODO: There is direct use of std::atomic<type *> from number__mapper, numberrangeformatter
// Either add ICU abstraction, or deprecate U_USER_ATOMICS_H.
// See Jira issu ICU-20185.
#elif U_HAVE_STD_ATOMICS
#if U_HAVE_STD_ATOMICS
// C++11 atomics are available.
@ -336,10 +331,12 @@ U_NAMESPACE_END
*************************************************************************************************/
#if defined(U_USER_MUTEX_H)
// #include "U_USER_MUTEX_H"
#include U_MUTEX_XSTR(U_USER_MUTEX_H)
// Support for including an alternate implementation of mutexes has been withdrawn.
// See issue ICU-20185.
#error U_USER_MUTEX_H not supported
#endif
#elif U_HAVE_STD_MUTEX
#if U_HAVE_STD_MUTEX
#include <mutex>
#include <condition_variable>