generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-04-26 01:36:19 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'support_cpp11_atomic'

Browse Source
This commit is contained in:
Nobuyuki Kubota 2015-03-10 18:53:14 +09:00
commit de68fbd6d0
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/msgpack/unpack.hpp
View File

@ -28,6 +28,11 @@
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#if !defined(MSGPACK_USE_CPP03)
#include <atomic>
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
// avoiding confliction std::max, std::min, and macro in windows.h // avoiding confliction std::max, std::min, and macro in windows.h
#ifndef NOMINMAX #ifndef NOMINMAX
@ -349,25 +354,46 @@ private:
inline void init_count(void* buffer) inline void init_count(void* buffer)
{ {
#if defined(MSGPACK_USE_CPP03)
*reinterpret_cast<volatile _msgpack_atomic_counter_t*>(buffer) = 1; *reinterpret_cast<volatile _msgpack_atomic_counter_t*>(buffer) = 1;
#else // defined(MSGPACK_USE_CPP03)
new (buffer) std::atomic<unsigned int>(1);
#endif // defined(MSGPACK_USE_CPP03)
} }
inline void decr_count(void* buffer) inline void decr_count(void* buffer)
{ {
#if defined(MSGPACK_USE_CPP03)
if(_msgpack_sync_decr_and_fetch(reinterpret_cast<volatile _msgpack_atomic_counter_t*>(buffer)) == 0) { if(_msgpack_sync_decr_and_fetch(reinterpret_cast<volatile _msgpack_atomic_counter_t*>(buffer)) == 0) {
free(buffer); free(buffer);
} }
#else // defined(MSGPACK_USE_CPP03)
if (--*reinterpret_cast<std::atomic<unsigned int>*>(buffer) == 0) {
free(buffer);
}
#endif // defined(MSGPACK_USE_CPP03)
} }
inline void incr_count(void* buffer) inline void incr_count(void* buffer)
{ {
#if defined(MSGPACK_USE_CPP03)
_msgpack_sync_incr_and_fetch(reinterpret_cast<volatile _msgpack_atomic_counter_t*>(buffer)); _msgpack_sync_incr_and_fetch(reinterpret_cast<volatile _msgpack_atomic_counter_t*>(buffer));
#else // defined(MSGPACK_USE_CPP03)
++*reinterpret_cast<std::atomic<unsigned int>*>(buffer);
#endif // defined(MSGPACK_USE_CPP03)
} }
#if defined(MSGPACK_USE_CPP03)
inline _msgpack_atomic_counter_t get_count(void* buffer) inline _msgpack_atomic_counter_t get_count(void* buffer)
{ {
return *reinterpret_cast<volatile _msgpack_atomic_counter_t*>(buffer); return *reinterpret_cast<volatile _msgpack_atomic_counter_t*>(buffer);
} }
#else // defined(MSGPACK_USE_CPP03)
inline std::atomic<unsigned int> const& get_count(void* buffer)
{
return *reinterpret_cast<std::atomic<unsigned int>*>(buffer);
}
#endif // defined(MSGPACK_USE_CPP03)
struct fix_tag { struct fix_tag {
char f1[65]; // FIXME unique size is required. or use is_same meta function. char f1[65]; // FIXME unique size is required. or use is_same meta function.