Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove 'using namespace std' statement. Fixes #276 #281

Merged
merged 4 commits into from
Nov 28, 2023
Merged

Remove 'using namespace std' statement. Fixes #276 #281

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16fe547
Remove 'using namespace std' statement. Fixes #276
cguimaraes Nov 17, 2023
244715f
Avoid reusing the same naming as std
cguimaraes Nov 21, 2023
177172c
Avoid reusing the same naming as std
cguimaraes Nov 21, 2023
a4cc939
Fix clang format
cguimaraes Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions include/zenoh-pico/collections/pointer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,21 @@
#ifndef __cplusplus
#include <stdatomic.h>
#define z_atomic(X) _Atomic X
#define _z_atomic_store_explicit atomic_store_explicit
#define _z_atomic_fetch_add_explicit atomic_fetch_add_explicit
#define _z_atomic_fetch_sub_explicit atomic_fetch_sub_explicit
#define _z_memory_order_acquire memory_order_acquire
#define _z_memory_order_release memory_order_release
#define _z_memory_order_relaxed memory_order_relaxed
#else
#include <atomic>
#define z_atomic(X) std::atomic<X>
using namespace std;
#define _z_atomic_store_explicit std::atomic_store_explicit
#define _z_atomic_fetch_add_explicit std::atomic_fetch_add_explicit
#define _z_atomic_fetch_sub_explicit std::atomic_fetch_sub_explicit
#define _z_memory_order_acquire std::memory_order_acquire
#define _z_memory_order_release std::memory_order_release
#define _z_memory_order_relaxed std::memory_order_relaxed
#endif

/*------------------ Internal Array Macros ------------------*/
Expand All @@ -42,7 +53,7 @@ using namespace std;
p._cnt = (z_atomic(unsigned int) *)z_malloc(sizeof(z_atomic(unsigned int) *)); \
if (p._cnt != NULL) { \
*p.ptr = val; \
atomic_store_explicit(p._cnt, 1, memory_order_relaxed); \
_z_atomic_store_explicit(p._cnt, 1, _z_memory_order_relaxed); \
} else { \
z_free(p.ptr); \
} \
Expand All @@ -53,15 +64,15 @@ using namespace std;
name##_sptr_t c; \
c._cnt = p->_cnt; \
c.ptr = p->ptr; \
atomic_fetch_add_explicit(p->_cnt, 1, memory_order_relaxed); \
_z_atomic_fetch_add_explicit(p->_cnt, 1, _z_memory_order_relaxed); \
return c; \
} \
static inline name##_sptr_t *name##_sptr_clone_as_ptr(name##_sptr_t *p) { \
name##_sptr_t *c = (name##_sptr_t *)z_malloc(sizeof(name##_sptr_t)); \
if (c != NULL) { \
c->_cnt = p->_cnt; \
c->ptr = p->ptr; \
atomic_fetch_add_explicit(p->_cnt, 1, memory_order_relaxed); \
_z_atomic_fetch_add_explicit(p->_cnt, 1, _z_memory_order_relaxed); \
} \
return c; \
} \
Expand All @@ -71,10 +82,10 @@ using namespace std;
static inline _Bool name##_sptr_drop(name##_sptr_t *p) { \
_Bool dropped = false; \
if (p->_cnt != NULL) { \
unsigned int c = atomic_fetch_sub_explicit(p->_cnt, 1, memory_order_release); \
unsigned int c = _z_atomic_fetch_sub_explicit(p->_cnt, 1, _z_memory_order_release); \
dropped = c == 1; \
if (dropped == true) { \
atomic_thread_fence(memory_order_acquire); \
atomic_thread_fence(_z_memory_order_acquire); \
if (p->ptr != NULL) { \
type##_clear(p->ptr); \
z_free(p->ptr); \
Expand Down
Loading