diff options
| author | Tyge Løvset <[email protected]> | 2022-10-20 22:01:40 +0200 |
|---|---|---|
| committer | Tyge Løvset <[email protected]> | 2022-10-20 22:01:40 +0200 |
| commit | 650f6218c1b2afce696b2dd7e98c76dcdeafce24 (patch) | |
| tree | b580f94d31008370564c2f2132ef0adc992f3c8b | |
| parent | 4694e23046f3692f7e4b857f8ea8a8ffd0374dbf (diff) | |
| download | STC-modified-650f6218c1b2afce696b2dd7e98c76dcdeafce24.tar.gz STC-modified-650f6218c1b2afce696b2dd7e98c76dcdeafce24.zip | |
Reverted some of the changes, but works now well.
| -rw-r--r-- | examples/city.c | 1 | ||||
| -rw-r--r-- | examples/music_arc.c | 1 | ||||
| -rw-r--r-- | include/stc/carc.h | 2 | ||||
| -rw-r--r-- | include/stc/cbox.h | 2 | ||||
| -rw-r--r-- | include/stc/ccommon.h | 1 | ||||
| -rw-r--r-- | include/stc/template.h | 3 |
6 files changed, 2 insertions, 8 deletions
diff --git a/examples/city.c b/examples/city.c index ba575f1e..0bae631a 100644 --- a/examples/city.c +++ b/examples/city.c @@ -14,7 +14,6 @@ void City_drop(City* c); #define i_type CityArc #define i_val_class City -#define i_opt c_no_hash #include <stc/cbox.h> //#include <stc/carc.h> // try instead of cbox.h diff --git a/examples/music_arc.c b/examples/music_arc.c index 0fb0dd70..d4b9ab14 100644 --- a/examples/music_arc.c +++ b/examples/music_arc.c @@ -22,7 +22,6 @@ void Song_drop(Song* s) { // Define the reference counted type #define i_type SongArc #define i_val_class Song -#define i_opt c_no_hash #include <stc/carc.h> // ... and a vector of it diff --git a/include/stc/carc.h b/include/stc/carc.h index 4b9cc875..cbe2e9e7 100644 --- a/include/stc/carc.h +++ b/include/stc/carc.h @@ -81,7 +81,7 @@ int main() { #if !(defined i_cmp || defined i_less || defined i_key_class || defined i_val_class) #define _i_no_cmp #endif -#if !(defined i_eq || defined i_hash || defined i_key_class || defined i_val_class) +#if !(defined i_eq || defined i_hash) #define _i_no_hash #endif #include "template.h" diff --git a/include/stc/cbox.h b/include/stc/cbox.h index 651abf4b..fbd19c50 100644 --- a/include/stc/cbox.h +++ b/include/stc/cbox.h @@ -73,7 +73,7 @@ int main() { #if !(defined i_cmp || defined i_less || defined i_key_class || defined i_val_class) #define _i_no_cmp #endif -#if !(defined i_eq || defined i_hash || defined i_key_class || defined i_val_class) +#if !(defined i_eq || defined i_hash) #define _i_no_hash #endif #include "template.h" diff --git a/include/stc/ccommon.h b/include/stc/ccommon.h index 5ecb42f8..52c05693 100644 --- a/include/stc/ccommon.h +++ b/include/stc/ccommon.h @@ -111,7 +111,6 @@ #define c_no_atomic (1<<1) #define c_no_clone (1<<2) #define c_no_cmp (1<<3) -#define c_no_hash (1<<4) /* Generic algorithms */ diff --git a/include/stc/template.h b/include/stc/template.h index 4e954b46..769c07c9 100644 --- a/include/stc/template.h +++ b/include/stc/template.h @@ -163,9 +163,6 @@ #if c_option(c_no_cmp) #define _i_no_cmp #endif -#if c_option(c_no_hash) - #define _i_no_hash -#endif #if c_option(c_no_clone) || (!defined i_keyclone && (defined i_keydrop || defined i_keyraw)) #define _i_no_clone #endif |