diff options
| author | Tyge Løvset <[email protected]> | 2021-10-04 09:07:51 +0200 |
|---|---|---|
| committer | Tyge Løvset <[email protected]> | 2021-10-04 09:07:51 +0200 |
| commit | 35997591de5a448752734c822b0f1003e08853a5 (patch) | |
| tree | e6252c64b71014feb10f3338f663d6d1ea7dfa3b /include | |
| parent | d314fa40bcfc3a7d5e4dfc8136aebff309db8667 (diff) | |
| download | STC-modified-35997591de5a448752734c822b0f1003e08853a5.tar.gz STC-modified-35997591de5a448752734c822b0f1003e08853a5.zip | |
Fixed a small bug and simplified template.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/stc/template.h | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/include/stc/template.h b/include/stc/template.h index cecf9790..865e5b83 100644 --- a/include/stc/template.h +++ b/include/stc/template.h @@ -54,30 +54,16 @@ #endif
#ifdef i_key_csptr
- #ifndef i_tag
- #define i_tag i_key_csptr
- #endif
#define i_key i_key_csptr
#define i_cmp c_PASTE(i_key_csptr, _compare)
#define i_keydel c_PASTE(i_key_csptr, _del)
#define i_keyfrom c_PASTE(i_key_csptr, _clone)
#endif
-#ifdef i_val_csptr
- #if !defined i_tag && !defined i_key
- #define i_tag i_val_csptr
- #endif
- #define i_val i_val_csptr
- #ifndef i_key
- #define i_cmp c_PASTE(i_val_csptr, _compare)
- #endif
- #define i_valdel c_PASTE(i_val_csptr, _del)
- #define i_valfrom c_PASTE(i_val_csptr, _clone)
-#endif
#ifdef i_key_str
#define i_key cstr
#ifndef i_tag
- #define i_tag str
+ #define i_tag str
#endif
#define i_cmp c_rawstr_compare
#define i_hash c_rawstr_hash
@@ -86,13 +72,23 @@ #define i_keyto cstr_str
#define i_keyraw const char*
#endif
+
+#ifdef i_val_csptr
+ #define i_val i_val_csptr
+ #ifndef i_key
+ #define i_cmp c_PASTE(i_val_csptr, _compare)
+ #endif
+ #define i_valdel c_PASTE(i_val_csptr, _del)
+ #define i_valfrom c_PASTE(i_val_csptr, _clone)
+#endif
+
#ifdef i_val_str
#define i_val cstr
#if !defined i_tag && !defined i_key
- #define i_tag str
+ #define i_tag str
#endif
#ifndef i_key
- #define i_cmp c_rawstr_compare
+ #define i_cmp c_rawstr_compare
#endif
#define i_valdel cstr_del
#define i_valfrom cstr_from
|