mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-28 23:09:59 +02:00
include: do not redefine standard C++ symbols
This commit is contained in:
parent
2223a9a181
commit
ada4b4748e
@ -33,82 +33,6 @@
|
||||
/*** Native C11 atomics ***/
|
||||
# include <stdatomic.h>
|
||||
|
||||
# else /* C++ */
|
||||
/*** Native C++11 atomics ***/
|
||||
# include <atomic>
|
||||
using std::atomic_is_lock_free;
|
||||
using std::atomic_init;
|
||||
using std::atomic_store;
|
||||
using std::atomic_store_explicit;
|
||||
using std::atomic_load;
|
||||
using std::atomic_load_explicit;
|
||||
using std::atomic_exchange;
|
||||
using std::atomic_exchange_explicit;
|
||||
using std::atomic_compare_exchange_strong;
|
||||
using std::atomic_compare_exchange_strong_explicit;
|
||||
using std::atomic_compare_exchange_weak;
|
||||
using std::atomic_compare_exchange_weak_explicit;
|
||||
using std::atomic_fetch_add;
|
||||
using std::atomic_fetch_add_explicit;
|
||||
using std::atomic_fetch_sub;
|
||||
using std::atomic_fetch_sub_explicit;
|
||||
using std::atomic_fetch_or;
|
||||
using std::atomic_fetch_or_explicit;
|
||||
using std::atomic_fetch_xor;
|
||||
using std::atomic_fetch_xor_explicit;
|
||||
using std::atomic_fetch_and;
|
||||
using std::atomic_fetch_and_explicit;
|
||||
using std::atomic_thread_fence;
|
||||
using std::atomic_signal_fence;
|
||||
|
||||
using std::memory_order;
|
||||
using std::memory_order_relaxed;
|
||||
using std::memory_order_consume;
|
||||
using std::memory_order_release;
|
||||
using std::memory_order_acq_rel;
|
||||
using std::memory_order_seq_cst;
|
||||
|
||||
using std::atomic_flag;
|
||||
typedef std::atomic<bool> atomic_bool;
|
||||
typedef std::atomic<char> atomic_char;
|
||||
typedef std::atomic<signed char> atomic_schar;
|
||||
typedef std::atomic<unsigned char> atomic_uchar;
|
||||
typedef std::atomic<short> atomic_short;
|
||||
typedef std::atomic<unsigned short> atomic_ushort;
|
||||
typedef std::atomic<int> atomic_int;
|
||||
typedef std::atomic<unsigned int> atomic_uint;
|
||||
typedef std::atomic<long> atomic_long;
|
||||
typedef std::atomic<unsigned long> atomic_ulong;
|
||||
typedef std::atomic<long long> atomic_llong;
|
||||
typedef std::atomic<unsigned long long> atomic_ullong;
|
||||
typedef std::atomic<char16_t> atomic_char16_t;
|
||||
typedef std::atomic<char32_t> atomic_char32_t;
|
||||
typedef std::atomic<wchar_t> atomic_wchar_t;
|
||||
typedef std::atomic<int_least8_t> atomic_int_least8_t;
|
||||
typedef std::atomic<uint_least8_t> atomic_uint_least8_t;
|
||||
typedef std::atomic<int_least16_t> atomic_int_least16_t;
|
||||
typedef std::atomic<uint_least16_t> atomic_uint_least16_t;
|
||||
typedef std::atomic<int_least32_t> atomic_int_least32_t;
|
||||
typedef std::atomic<uint_least32_t> atomic_uint_least32_t;
|
||||
typedef std::atomic<int_least64_t> atomic_int_least64_t;
|
||||
typedef std::atomic<uint_least64_t> atomic_uint_least64_t;
|
||||
typedef std::atomic<int_fast8_t> atomic_int_fast8_t;
|
||||
typedef std::atomic<uint_fast8_t> atomic_uint_fast8_t;
|
||||
typedef std::atomic<int_fast16_t> atomic_int_fast16_t;
|
||||
typedef std::atomic<uint_fast16_t> atomic_uint_fast16_t;
|
||||
typedef std::atomic<int_fast32_t> atomic_int_fast32_t;
|
||||
typedef std::atomic<uint_fast32_t> atomic_uint_fast32_t;
|
||||
typedef std::atomic<int_fast64_t> atomic_int_fast64_t;
|
||||
typedef std::atomic<uint_fast64_t> atomic_uint_fast64_t;
|
||||
typedef std::atomic<intptr_t> atomic_intptr_t;
|
||||
typedef std::atomic<uintptr_t> atomic_uintptr_t;
|
||||
typedef std::atomic<size_t> atomic_size_t;
|
||||
typedef std::atomic<ptrdiff_t> atomic_ptrdiff_t;
|
||||
typedef std::atomic<intmax_t> atomic_intmax_t;
|
||||
typedef std::atomic<uintmax_t> atomic_uintmax_t;
|
||||
|
||||
# endif /* C++ */
|
||||
|
||||
typedef atomic_uint_least32_t vlc_atomic_float;
|
||||
|
||||
static inline void vlc_atomic_init_float(vlc_atomic_float *var, float f)
|
||||
@ -134,4 +58,9 @@ static inline void vlc_atomic_store_float(vlc_atomic_float *atom, float f)
|
||||
atomic_store(atom, u.i);
|
||||
}
|
||||
|
||||
# else /* C++ */
|
||||
/*** Native C++11 atomics ***/
|
||||
# include <atomic>
|
||||
# endif /* C++ */
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user