diff options
| author | Tyge Lovset <[email protected]> | 2022-04-19 21:15:49 +0200 |
|---|---|---|
| committer | Tyge Lovset <[email protected]> | 2022-04-19 21:15:49 +0200 |
| commit | a9c0f215e3e98c165de07d9661595b0dd64cc4fb (patch) | |
| tree | 3478ba72d54a13cf777c5cbad1546630cee311bf /include | |
| parent | ba6da4261792bd5da7da952877c299cd5c7a607b (diff) | |
| download | STC-modified-a9c0f215e3e98c165de07d9661595b0dd64cc4fb.tar.gz STC-modified-a9c0f215e3e98c165de07d9661595b0dd64cc4fb.zip | |
Renamed cbox_new/carc_new to cbox_make/carc_make. Disabled container emplace on arcbox elements.
Diffstat (limited to 'include')
| -rw-r--r-- | include/stc/carc.h | 2 | ||||
| -rw-r--r-- | include/stc/cbox.h | 2 | ||||
| -rw-r--r-- | include/stc/template.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/stc/carc.h b/include/stc/carc.h index 374044f3..2ed7da4c 100644 --- a/include/stc/carc.h +++ b/include/stc/carc.h @@ -145,7 +145,7 @@ _cx_memb(_reset_from)(_cx_self* self, i_val val) { #if !defined _i_no_clone
STC_INLINE _cx_self
- _cx_memb(_new)(_cx_raw raw) { return _cx_memb(_from)(i_valfrom(raw)); }
+ _cx_memb(_make)(_cx_raw raw) { return _cx_memb(_from)(i_valfrom(raw)); }
#endif
// does not use i_valfrom, so we can bypass c_no_clone
diff --git a/include/stc/cbox.h b/include/stc/cbox.h index d7c9ece9..4305701b 100644 --- a/include/stc/cbox.h +++ b/include/stc/cbox.h @@ -119,7 +119,7 @@ _cx_memb(_reset_from)(_cx_self* self, i_val val) { #if !defined _i_no_clone
STC_INLINE _cx_self
- _cx_memb(_new)(_cx_raw raw) { return _cx_memb(_from)(i_valfrom(raw)); }
+ _cx_memb(_make)(_cx_raw raw) { return _cx_memb(_from)(i_valfrom(raw)); }
STC_INLINE _cx_self
_cx_memb(_clone)(_cx_self other) {
diff --git a/include/stc/template.h b/include/stc/template.h index e46b7390..4509d59c 100644 --- a/include/stc/template.h +++ b/include/stc/template.h @@ -63,6 +63,7 @@ #elif defined i_key_arcbox
#define i_key_bind i_key_arcbox
#define i_keyraw c_paste(i_key_arcbox, _value)
+ #define _i_no_emplace
#endif
#ifdef i_key_bind
@@ -112,6 +113,7 @@ #elif defined i_val_arcbox
#define i_val_bind i_val_arcbox
#define i_valraw c_paste(i_val_arcbox, _value)
+ #define _i_no_emplace
#endif
#ifdef i_val_bind
|