Merge branch 'unstable' into keydbpro

Former-commit-id: 53b36801cede2dbebbf33ec665af69f810b438d5
This commit is contained in:
John Sully 2020-02-01 21:52:26 -05:00
commit cb9c7d3a80

View File

@ -850,8 +850,8 @@ public:
void setrefcount(unsigned ref); void setrefcount(unsigned ref);
unsigned getrefcount(std::memory_order order) const { return (refcount.load(order) & ~(1U << 31)); } unsigned getrefcount(std::memory_order order) const { return (refcount.load(order) & ~(1U << 31)); }
void addref() const { refcount.fetch_add(1, std::memory_order_acq_rel); } void addref() const { refcount.fetch_add(1, std::memory_order_relaxed); }
unsigned release() const { return refcount.fetch_sub(1, std::memory_order_acq_rel) & ~(1U << 31); } unsigned release() const { return refcount.fetch_sub(1, std::memory_order_relaxed) & ~(1U << 31); }
} robj; } robj;
static_assert(sizeof(redisObject) == 24, "object size is critical, don't increase"); static_assert(sizeof(redisObject) == 24, "object size is critical, don't increase");