From 7c88fc11ef62d5be83fe34fe72da6eadfd64ba6b Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Wed, 20 Apr 2022 11:24:11 +0200 Subject: Some cleanup after carc / cbox updates. --- include/stc/carc.h | 6 ++---- include/stc/cbox.h | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'include/stc') diff --git a/include/stc/carc.h b/include/stc/carc.h index 2ed7da4c..a061a606 100644 --- a/include/stc/carc.h +++ b/include/stc/carc.h @@ -143,10 +143,8 @@ _cx_memb(_reset_from)(_cx_self* self, i_val val) { *self = _cx_memb(_from)(val); } -#if !defined _i_no_clone - STC_INLINE _cx_self - _cx_memb(_make)(_cx_raw raw) { return _cx_memb(_from)(i_valfrom(raw)); } -#endif +STC_INLINE _cx_self +_cx_memb(_make)(_cx_raw raw) { return _cx_memb(_from)(i_valfrom(raw)); } // does not use i_valfrom, so we can bypass c_no_clone STC_INLINE _cx_self diff --git a/include/stc/cbox.h b/include/stc/cbox.h index 4305701b..690c8a7f 100644 --- a/include/stc/cbox.h +++ b/include/stc/cbox.h @@ -117,10 +117,10 @@ _cx_memb(_reset_from)(_cx_self* self, i_val val) { else self->get = c_new(i_val, val); } -#if !defined _i_no_clone - STC_INLINE _cx_self - _cx_memb(_make)(_cx_raw raw) { return _cx_memb(_from)(i_valfrom(raw)); } +STC_INLINE _cx_self +_cx_memb(_make)(_cx_raw raw) { return _cx_memb(_from)(i_valfrom(raw)); } +#if !defined _i_no_clone STC_INLINE _cx_self _cx_memb(_clone)(_cx_self other) { if (!other.get) return other; -- cgit v1.2.3