Renamed ..._value_t -> ..._value, etc. Deprecated, still works for cvec, cdeq, cmap, csmap, cslist

12 files changed, 45 insertions, 45 deletions

diff --git a/benchmarks/cdeq_benchmark.cpp b/benchmarks/cdeq_benchmark.cpp
index 0c4def50..6db167b0 100644
--- a/benchmarks/cdeq_benchmark.cpp
+++ b/benchmarks/cdeq_benchmark.cpp
@@ -88,7 +88,7 @@ Sample test_stc_deque() {
         c_forrange (N) cdeq_x_push_back(&con, stc64_random() & mask2);

         s.test[FIND].t1 = clock();

         size_t sum = 0;

-        //cdeq_x_iter_t it, end = cdeq_x_end(&con);

+        //cdeq_x_iter it, end = cdeq_x_end(&con);

         //c_forrange (S) if ((it = cdeq_x_find(&con, stc64_random() & mask2)).ref != end.ref) sum += *it.ref;

         s.test[FIND].t2 = clock();

         s.test[FIND].sum = sum;

diff --git a/benchmarks/clist_benchmark.cpp b/benchmarks/clist_benchmark.cpp
index 525bcc5a..676d31e7 100644
--- a/benchmarks/clist_benchmark.cpp
+++ b/benchmarks/clist_benchmark.cpp
@@ -85,7 +85,7 @@ Sample test_stc_forward_list() {
         c_forrange (N) clist_x_push_front(&con, stc64_random() & mask2);

         s.test[FIND].t1 = clock();

         size_t sum = 0;

-        //clist_x_iter_t it, end = clist_x_end(&con);

+        //clist_x_iter it, end = clist_x_end(&con);

         //c_forrange (S) if ((it = clist_x_find(&con, stc64_random() & mask2)).ref != end.ref) sum += *it.ref;

         s.test[FIND].t2 = clock();

         s.test[FIND].sum = sum;

diff --git a/benchmarks/cmap_benchmark.cpp b/benchmarks/cmap_benchmark.cpp
index d94f2f24..dc104c2d 100644
--- a/benchmarks/cmap_benchmark.cpp
+++ b/benchmarks/cmap_benchmark.cpp
@@ -91,7 +91,7 @@ Sample test_stc_unordered_map() {
         stc64_srandom(seed);

         s.test[FIND].t1 = clock();

         size_t sum = 0;

-        cmap_x_value_t* val;

+        cmap_x_value* val;

         c_forrange (N) 

             if ((val = cmap_x_get(&con, stc64_random() & mask1)))

                 sum += val->second;

diff --git a/benchmarks/csmap_benchmark.cpp b/benchmarks/csmap_benchmark.cpp
index fa1e10cf..bb055367 100644
--- a/benchmarks/csmap_benchmark.cpp
+++ b/benchmarks/csmap_benchmark.cpp
@@ -91,7 +91,7 @@ Sample test_stc_map() {
         stc64_srandom(seed);

         s.test[FIND].t1 = clock();

         size_t sum = 0;

-        csmap_x_value_t* val;

+        csmap_x_value* val;

         c_forrange (N) 

             if ((val = csmap_x_get(&con, stc64_random() & mask1)))

                 sum += val->second;

diff --git a/benchmarks/cvec_benchmark.cpp b/benchmarks/cvec_benchmark.cpp
index f7755cf6..c4648e34 100644
--- a/benchmarks/cvec_benchmark.cpp
+++ b/benchmarks/cvec_benchmark.cpp
@@ -84,7 +84,7 @@ Sample test_stc_vector() {
         c_forrange (N) cvec_x_push_back(&con, stc64_random() & mask2);

         s.test[FIND].t1 = clock();

         size_t sum = 0;

-        //cvec_x_iter_t it, end = cvec_x_end(&con);

+        //cvec_x_iter it, end = cvec_x_end(&con);

         //c_forrange (S) if ((it = cvec_x_find(&con, stc64_random() & mask2)).ref != end.ref) sum += *it.ref;

         s.test[FIND].t2 = clock();

         s.test[FIND].sum = sum;

diff --git a/benchmarks/others/old/carray_v1.h b/benchmarks/others/old/carray_v1.h
index 65777416..c4f294cf 100644
--- a/benchmarks/others/old/carray_v1.h
+++ b/benchmarks/others/old/carray_v1.h
@@ -53,15 +53,15 @@ int main()
 

 #define using_carray2_4(X, Value, valueDel, valueClone) \

 \

-    typedef Value carray1##X##_value_t, carray2##X##_value_t; \

+    typedef Value carray1##X##_value, carray2##X##_value; \

 \

     typedef struct { \

-        carray1##X##_value_t *data; \

+        carray1##X##_value *data; \

         size_t _xdim; \

     } carray1##X; \

 \

     typedef struct { \

-        carray2##X##_value_t *data; \

+        carray2##X##_value *data; \

         size_t _xdim, _ydim; \

     } carray2##X; \

 \

@@ -77,7 +77,7 @@ int main()
 \

     STC_INLINE carray1##X \

     carray1##X##_init(size_t xdim, Value val) { \

-        carray1##X##_value_t* m = c_new_n(carray1##X##_value_t, xdim); \

+        carray1##X##_value* m = c_new_n(carray1##X##_value, xdim); \

         for (size_t i=0; i<xdim; ++i) m[i] = val; \

         carray1##X a = {m, xdim | _carray_OWN}; \

         return a; \

@@ -85,24 +85,24 @@ int main()
     STC_INLINE carray2##X \

     carray2##X##_init(size_t ydim, size_t xdim, Value val) { \

         const size_t n = ydim * xdim; \

-        carray2##X##_value_t* m = c_new_n(carray2##X##_value_t, n); \

+        carray2##X##_value* m = c_new_n(carray2##X##_value, n); \

         for (size_t i=0; i<n; ++i) m[i] = val; \

         carray2##X a = {m, xdim | _carray_OWN, ydim}; \

         return a; \

     } \

 \

     STC_INLINE carray1##X \

-    carray1##X##_from(carray1##X##_value_t* array, size_t xdim) { \

+    carray1##X##_from(carray1##X##_value* array, size_t xdim) { \

         carray1##X a = {array, xdim}; \

         return a; \

     } \

     STC_INLINE carray2##X \

-    carray2##X##_from(carray2##X##_value_t* array, size_t ydim, size_t xdim) { \

+    carray2##X##_from(carray2##X##_value* array, size_t ydim, size_t xdim) { \

         carray2##X a = {array, xdim, ydim}; \

         return a; \

     } \

 \

-    STC_INLINE carray1##X##_value_t* \

+    STC_INLINE carray1##X##_value* \

     carray1##X##_at(const carray1##X *a, size_t x) { return a->data + x; } \

     \

     STC_INLINE carray1##X \

@@ -110,7 +110,7 @@ int main()
         carray1##X sub = {a->data + y*_carray_xdim(*a), _carray_xdim(*a)}; \

         return sub; \

     } \

-    STC_INLINE carray2##X##_value_t* \

+    STC_INLINE carray2##X##_value* \

     carray2##X##_at(const carray2##X *a, size_t y, size_t x) { \

         return a->data + y*_carray_xdim(*a) + x; \

     } \

@@ -125,10 +125,10 @@ int main()
 #define using_carray3_4(X, Value, valueDel, valueClone) \

 \

     using_carray2_4(X, Value, valueDel, valueClone); \

-    typedef Value carray3##X##_value_t; \

+    typedef Value carray3##X##_value; \

 \

     typedef struct { \

-        carray3##X##_value_t *data; \

+        carray3##X##_value *data; \

         size_t _xdim, _ydim, _zdim; \

     } carray3##X; \

 \

@@ -144,14 +144,14 @@ int main()
     STC_INLINE carray3##X \

     carray3##X##_init(size_t zdim, size_t ydim, size_t xdim, Value val) { \

         const size_t n = zdim * ydim * xdim; \

-        carray3##X##_value_t* m = c_new_n(carray3##X##_value_t, n); \

+        carray3##X##_value* m = c_new_n(carray3##X##_value, n); \

         for (size_t i=0; i<n; ++i) m[i] = val; \

         carray3##X a = {m, xdim | _carray_OWN, ydim, zdim}; \

         return a; \

     } \

 \

     STC_INLINE carray3##X \

-    carray3##X##_from(carray3##X##_value_t* array, size_t zdim, size_t ydim, size_t xdim) { \

+    carray3##X##_from(carray3##X##_value* array, size_t zdim, size_t ydim, size_t xdim) { \

         carray3##X a = {array, xdim, ydim, zdim}; \

         return a; \

     } \

@@ -166,7 +166,7 @@ int main()
         carray1##X sub = {a->data + (z*_carray_ydim(*a) + y)*_carray_xdim(*a), _carray_xdim(*a)}; \

         return sub; \

     } \

-    STC_INLINE carray3##X##_value_t* \

+    STC_INLINE carray3##X##_value* \

     carray3##X##_at(const carray3##X *a, size_t z, size_t y, size_t x) { \

         return a->data + (z*_carray_ydim(*a) + y)*_carray_xdim(*a) + x; \

     } \

@@ -180,18 +180,18 @@ int main()
 #define _carray_zdim(a) (a)._zdim

 

 #define _using_carray_common(D, X, Value, valueDel, valueClone) \

-    typedef struct { carray1##X##_value_t *ref; } carray##D##X##_iter_t; \

+    typedef struct { carray1##X##_value *ref; } carray##D##X##_iter; \

 \

-    STC_INLINE carray##D##X##_iter_t \

+    STC_INLINE carray##D##X##_iter \

     carray##D##X##_begin(const carray##D##X* a) { \

-        carray##D##X##_iter_t it = {a->data}; return it; \

+        carray##D##X##_iter it = {a->data}; return it; \

     } \

-    STC_INLINE carray##D##X##_iter_t \

+    STC_INLINE carray##D##X##_iter \

     carray##D##X##_end(const carray##D##X* a) { \

-        carray##D##X##_iter_t it = {a->data + carray##D##X##_size(*a)}; return it; \

+        carray##D##X##_iter it = {a->data + carray##D##X##_size(*a)}; return it; \

     } \

     STC_INLINE void \

-    carray##D##X##_next(carray##D##X##_iter_t* it) {++it->ref;} \

+    carray##D##X##_next(carray##D##X##_iter* it) {++it->ref;} \

 \

     STC_INLINE void \

     carray##D##X##_del(carray##D##X* self) { \

@@ -204,7 +204,7 @@ int main()
     STC_INLINE carray##D##X \

     carray##D##X##_clone(carray##D##X arr) { \

         carray##D##X cp = arr; size_t k = 0; \

-        cp.data = c_new_n(carray1##X##_value_t, carray##D##X##_size(arr)); \

+        cp.data = c_new_n(carray1##X##_value, carray##D##X##_size(arr)); \

         c_foreach_3 (i, carray##D##X, arr) \

             cp.data[k++] = valueClone(*i.ref); \

         return cp; \

diff --git a/benchmarks/others/old/clist.h b/benchmarks/others/old/clist.h
index e677e40d..ea1bb9a5 100644
--- a/benchmarks/others/old/clist.h
+++ b/benchmarks/others/old/clist.h
@@ -289,7 +289,7 @@ STC_API size_t _clist_count(const clist_VOID* self);
     STC_DEF void \

     _cx_memb(_sort)(_cx_self* self) { \

         if (self->last) \

-            self->last = (_cx_node *) _clist_mergesort((clist_VOID_node_t *) self->last->next, _cx_memb(_sort_cmp_)); \

+            self->last = (_cx_node *) _clist_mergesort((clist_VOID_node *) self->last->next, _cx_memb(_sort_cmp_)); \

     }

 

 

@@ -302,7 +302,7 @@ STC_API size_t _clist_count(const clist_VOID* self);
 

 STC_DEF size_t

 _clist_count(const clist_VOID* self) {

-    const clist_VOID_node_t *nd = self->last;

+    const clist_VOID_node *nd = self->last;

     if (!nd) return 0;

     size_t n = 1;

     while ((nd = nd->next) != self->last) ++n;

@@ -312,9 +312,9 @@ _clist_count(const clist_VOID* self) {
 /* Singly linked list Mergesort implementation by Simon Tatham. O(n*log n).

  * https://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html

  */

-STC_DEF clist_VOID_node_t *

-_clist_mergesort(clist_VOID_node_t *list, int (*cmp)(const void*, const void*)) {

-    clist_VOID_node_t *p, *q, *e, *tail, *oldhead;

+STC_DEF clist_VOID_node *

+_clist_mergesort(clist_VOID_node *list, int (*cmp)(const void*, const void*)) {

+    clist_VOID_node *p, *q, *e, *tail, *oldhead;

     int insize = 1, nmerges, psize, qsize, i;

 

     while (1) {

diff --git a/benchmarks/others/old/csmap.h b/benchmarks/others/old/csmap.h
index a60d16e0..699e18c1 100644
--- a/benchmarks/others/old/csmap.h
+++ b/benchmarks/others/old/csmap.h
@@ -36,7 +36,7 @@ int main(void) {
         csmap_mx_insert(&m, 8, 'b');

         csmap_mx_insert(&m, 12, 'c');

 

-        csmap_mx_iter_t it = csmap_mx_find(&m, 10); // none

+        csmap_mx_iter it = csmap_mx_find(&m, 10); // none

         char val = csmap_mx_find(&m, 5).ref->second;

         csmap_mx_put(&m, 5, 'd'); // update

         csmap_mx_erase(&m, 8);

@@ -70,10 +70,10 @@ int main(void) {
     _c_aatree_complete_types(_cx_self, C); \

 \

     typedef i_keyraw _cx_rawkey; \

-    typedef i_valraw _cx_memb(_rawmapped_t); \

+    typedef i_valraw _cx_memb(_rawmapped); \

     typedef cx_SET_ONLY( _cx_rawkey ) \

             cx_MAP_ONLY( struct { _cx_rawkey first; \

-                                   _cx_memb(_rawmapped_t) second; } ) \

+                                   _cx_memb(_rawmapped) second; } ) \

     _cx_rawvalue; \

 \

     STC_API _cx_self               _cx_memb(_init)(void); \

@@ -201,7 +201,7 @@ int main(void) {
 

 _c_aatree_types(csmap_SENTINEL, csmap_, int, int);

 _c_aatree_complete_types(csmap_SENTINEL, csmap_);

-static csmap_SENTINEL_node_t _aatree_sentinel = {&_aatree_sentinel, &_aatree_sentinel, 0};

+static csmap_SENTINEL_node _aatree_sentinel = {&_aatree_sentinel, &_aatree_sentinel, 0};

 

 #define _c_implement_aatree(_cx_self, C, i_key, i_val, i_cmp, \

                             i_valdel, i_valfrom, i_valto, i_valraw, \

diff --git a/benchmarks/others/parallel_hashmap/btree.h b/benchmarks/others/parallel_hashmap/btree.h
index ae1aec5b..b8c95433 100644
--- a/benchmarks/others/parallel_hashmap/btree.h
+++ b/benchmarks/others/parallel_hashmap/btree.h
@@ -699,7 +699,7 @@ namespace phmap {
 
         template <
             typename Compare, typename K, typename LK,
-            phmap::enable_if_t<!std::is_same<bool, phmap::invoke_result_t<
+            phmap::enable_if_t<!std::is_same<bool, phmap::invoke_result<
                                                        Compare, const K &, const LK &>>::value,
                                int> = 0>
             constexpr phmap::weak_ordering do_three_way_comparison(const Compare &compare,
@@ -708,7 +708,7 @@ namespace phmap {
         }
         template <
             typename Compare, typename K, typename LK,
-            phmap::enable_if_t<std::is_same<bool, phmap::invoke_result_t<Compare,
+            phmap::enable_if_t<std::is_same<bool, phmap::invoke_result<Compare,
             const K &, const LK &>>::value,
                                int> = 0>
             constexpr phmap::weak_ordering do_three_way_comparison(const Compare &compare,
@@ -730,7 +730,7 @@ namespace priv {
     // comparator.
     template <typename Compare, typename T>
     using btree_is_key_compare_to =
-        std::is_convertible<phmap::invoke_result_t<Compare, const T &, const T &>,
+        std::is_convertible<phmap::invoke_result<Compare, const T &, const T &>,
                             phmap::weak_ordering>;
 
     struct StringBtreeDefaultLess {
@@ -2494,7 +2494,7 @@ namespace priv {
 
         // Verify that key_compare returns an phmap::{weak,strong}_ordering or bool.
         using compare_result_type =
-            phmap::invoke_result_t<key_compare, key_type, key_type>;
+            phmap::invoke_result<key_compare, key_type, key_type>;
         static_assert(
             std::is_same<compare_result_type, bool>::value ||
             std::is_convertible<compare_result_type, phmap::weak_ordering>::value,
diff --git a/benchmarks/others/parallel_hashmap/phmap_base.h b/benchmarks/others/parallel_hashmap/phmap_base.h
index 6b9ea9ee..d0c6f3ce 100644
--- a/benchmarks/others/parallel_hashmap/phmap_base.h
+++ b/benchmarks/others/parallel_hashmap/phmap_base.h
@@ -330,9 +330,9 @@ using underlying_type_t = typename std::underlying_type<T>::type;
 
 template< class F, class... ArgTypes>
 #if PHMAP_HAVE_CC17
-    using invoke_result_t = typename std::invoke_result_t<F, ArgTypes...>;
+    using invoke_result = typename std::invoke_result<F, ArgTypes...>;
 #else
-    using invoke_result_t = typename std::result_of<F(ArgTypes...)>::type;
+    using invoke_result = typename std::result_of<F(ArgTypes...)>::type;
 #endif
 
 namespace type_traits_internal {
diff --git a/benchmarks/shootout3_csmap.cpp b/benchmarks/shootout3_csmap.cpp
index 3682c874..dfa0ab1b 100644
--- a/benchmarks/shootout3_csmap.cpp
+++ b/benchmarks/shootout3_csmap.cpp
@@ -179,7 +179,7 @@ static void ins_and_access_csmap_i(picobench::state& s)
     picobench::scope scope(s);

     c_forrange (s.iterations()) {

         result += ++csmap_i_emplace(&map, stc64_random() & mask, 0).ref->second;

-        csmap_i_value_t* val = csmap_i_get(&map, stc64_random() & mask);

+        csmap_i_value* val = csmap_i_get(&map, stc64_random() & mask);

         if (val) csmap_i_erase(&map, val->first);

     }

     s.set_result(result + csmap_i_size(map));

@@ -236,7 +236,7 @@ static void ins_and_access_csmap_s(picobench::state& s)
     c_forrange (s.iterations()) {

         randomize(str.str, cstr_size(str));

         result += csmap_str_erase(&map, str.str);

-        /*csmap_str_iter_t it = csmap_str_find(&map, str.str);

+        /*csmap_str_iter it = csmap_str_find(&map, str.str);

         if (it.ref) {

             ++result;

             csmap_str_erase(&map, it.ref->first.str);

diff --git a/benchmarks/string_bench.c b/benchmarks/string_bench.c
index 7da3b838..8e639aa2 100644
--- a/benchmarks/string_bench.c
+++ b/benchmarks/string_bench.c
@@ -119,7 +119,7 @@ void benchmark(cvec_str vec_string, struct Maps maps)
     stopwatch = clock();

     for (size_t i = 0; i < MAX_LOOP; ++i)

     {

-        csmap_str_iter_t it, end = csmap_str_end(maps.snormal); 

+        csmap_str_iter it, end = csmap_str_end(maps.snormal); 

         for (size_t j = 0; j < cvec_str_size(vec_string); ++j)

         {

             csmap_str_find_it(maps.snormal, vec_string.data[j].str, &it);

@@ -136,7 +136,7 @@ void benchmark(cvec_str vec_string, struct Maps maps)
     stopwatch = clock();

     for (size_t i = 0; i < MAX_LOOP; ++i)

     {

-        cmap_str_iter_t it, end = cmap_str_end(maps.unormal); 

+        cmap_str_iter it, end = cmap_str_end(maps.unormal); 

         for (size_t j = 0; j < cvec_str_size(vec_string); ++j)

         {

             it = cmap_str_find(maps.unormal, vec_string.data[j].str);