src/cx/map.h

changeset 957
26e47a874f19
parent 890
54565fd74e74
equal deleted inserted replaced
956:abd60ccd74f7 957:26e47a874f19
655 __attribute__((__nonnull__, __warn_unused_result__)) 655 __attribute__((__nonnull__, __warn_unused_result__))
656 static inline void *cxMapRemoveAndGet( 656 static inline void *cxMapRemoveAndGet(
657 CxMap *map, 657 CxMap *map,
658 CxHashKey key 658 CxHashKey key
659 ) { 659 ) {
660 return map->cl->remove(map, key, !map->store_pointer); 660 return map->cl->remove(map, key, !map->collection.store_pointer);
661 } 661 }
662 662
663 /** 663 /**
664 * Removes a key/value-pair from the map by using the key. 664 * Removes a key/value-pair from the map by using the key.
665 * 665 *
682 __attribute__((__nonnull__, __warn_unused_result__)) 682 __attribute__((__nonnull__, __warn_unused_result__))
683 static inline void *cxMapRemoveAndGet( 683 static inline void *cxMapRemoveAndGet(
684 CxMap *map, 684 CxMap *map,
685 cxstring key 685 cxstring key
686 ) { 686 ) {
687 return map->cl->remove(map, cx_hash_key_cxstr(key), !map->store_pointer); 687 return map->cl->remove(map, cx_hash_key_cxstr(key), !map->collection.store_pointer);
688 } 688 }
689 689
690 /** 690 /**
691 * Removes a key/value-pair from the map by using the key. 691 * Removes a key/value-pair from the map by using the key.
692 * 692 *
709 __attribute__((__nonnull__, __warn_unused_result__)) 709 __attribute__((__nonnull__, __warn_unused_result__))
710 static inline void *cxMapRemoveAndGet( 710 static inline void *cxMapRemoveAndGet(
711 CxMap *map, 711 CxMap *map,
712 cxmutstr key 712 cxmutstr key
713 ) { 713 ) {
714 return map->cl->remove(map, cx_hash_key_cxstr(key), !map->store_pointer); 714 return map->cl->remove(map, cx_hash_key_cxstr(key), !map->collection.store_pointer);
715 } 715 }
716 716
717 /** 717 /**
718 * Removes a key/value-pair from the map by using the key. 718 * Removes a key/value-pair from the map by using the key.
719 * 719 *
736 __attribute__((__nonnull__, __warn_unused_result__)) 736 __attribute__((__nonnull__, __warn_unused_result__))
737 static inline void *cxMapRemoveAndGet( 737 static inline void *cxMapRemoveAndGet(
738 CxMap *map, 738 CxMap *map,
739 const char *key 739 const char *key
740 ) { 740 ) {
741 return map->cl->remove(map, cx_hash_key_str(key), !map->store_pointer); 741 return map->cl->remove(map, cx_hash_key_str(key), !map->collection.store_pointer);
742 } 742 }
743 743
744 #else // __cplusplus 744 #else // __cplusplus
745 745
746 /** 746 /**

mercurial