diff options
| author | Tyge Løvset <[email protected]> | 2022-10-24 23:45:53 +0200 |
|---|---|---|
| committer | Tyge Løvset <[email protected]> | 2022-10-24 23:45:53 +0200 |
| commit | 538fdd51a7e530adf2ab31a76deb9ac8e52f525e (patch) | |
| tree | 746b3d24a8bd30e1a61cee34c51e281ad69b501f | |
| parent | cf2ff10878153588b69e7e34523773e2bc42d79e (diff) | |
| download | STC-modified-538fdd51a7e530adf2ab31a76deb9ac8e52f525e.tar.gz STC-modified-538fdd51a7e530adf2ab31a76deb9ac8e52f525e.zip | |
Fix in cbox/carc.
| -rw-r--r-- | include/stc/carc.h | 5 | ||||
| -rw-r--r-- | include/stc/cbox.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/stc/carc.h b/include/stc/carc.h index e061aa2c..91de0931 100644 --- a/include/stc/carc.h +++ b/include/stc/carc.h @@ -149,8 +149,13 @@ STC_INLINE void _cx_memb(_reset_to)(_cx_self* self, _cx_value* p) { *self = _cx_memb(_from_ptr)(p); } +#ifndef _i_no_emplace STC_INLINE _cx_self _cx_memb(_new)(_cx_raw raw) { return _cx_memb(_from)(i_keyfrom(raw)); } +#else +STC_INLINE _cx_self _cx_memb(_new)(_cx_value val) + { return _cx_memb(_from)(val); } +#endif // does not use i_keyclone, so OK to always define. STC_INLINE _cx_self _cx_memb(_clone)(_cx_self ptr) { diff --git a/include/stc/cbox.h b/include/stc/cbox.h index dc7b76ba..cb8b7069 100644 --- a/include/stc/cbox.h +++ b/include/stc/cbox.h @@ -128,8 +128,13 @@ STC_INLINE void _cx_memb(_reset_to)(_cx_self* self, _cx_value* p) { self->get = p; } +#ifndef _i_no_emplace STC_INLINE _cx_self _cx_memb(_new)(_cx_raw raw) { return _cx_memb(_from)(i_keyfrom(raw)); } +#else +STC_INLINE _cx_self _cx_memb(_new)(_cx_value val) + { return _cx_memb(_from)(val); } +#endif #if !defined _i_no_clone STC_INLINE _cx_self _cx_memb(_clone)(_cx_self other) { |