Skip to content

Commit 4170367

Browse files
committed
Release 1.0.24
* Added definition of MacOS dependencies in build scripts. * Updated module versions in dependencies.
2 parents cf67aaf + a54ffc0 commit 4170367

14 files changed

+86
-52
lines changed

CHANGELOG

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 1.0.24 ===
6+
* Added definition of MacOS dependencies in build scripts.
7+
* Updated module versions in dependencies.
8+
59
=== 1.0.23 ===
610
* Updated build scripts.
711
* Updated module versions in dependencies.

dependencies.mk

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <sadko4u@gmail.com>
44
#
55
# This file is part of lsp-lltl-lib
66
#
@@ -60,6 +60,17 @@ ifeq ($(PLATFORM),Windows)
6060
TEST_DEPENDENCIES += $(WINDOWS_TEST_DEPENDENCIES)
6161
endif
6262

63+
#------------------------------------------------------------------------------
64+
# MacOS dependencies
65+
MACOS_DEPENDENCIES =
66+
67+
MACOS_TEST_DEPENDENCIES =
68+
69+
ifeq ($(PLATFORM),MacOS)
70+
DEPENDENCIES += $(MACOS_DEPENDENCIES)
71+
TEST_DEPENDENCIES += $(MACOS_TEST_DEPENDENCIES)
72+
endif
73+
6374
#------------------------------------------------------------------------------
6475
# Haiku dependencies
6576
HAIKU_DEPENDENCIES = \
@@ -80,9 +91,11 @@ ALL_DEPENDENCIES = \
8091
$(LINUX_DEPENDENCIES) \
8192
$(BSD_DEPENDENCIES) \
8293
$(WINDOWS_DEPENDENCIES) \
94+
$(MACOS_DEPENDENCIES) \
8395
$(HAIKU_DEPENDENCIES) \
8496
$(TEST_DEPENDENCIES) \
8597
$(LINUX_TEST_DEPENDENCIES) \
8698
$(BSD_TEST_DEPENDENCIES) \
8799
$(WINDOWS_TEST_DEPENDENCIES) \
100+
$(MACOS_TEST_DEPENDENCIES) \
88101
$(HAIKU_TEST_DEPENDENCIES)

include/lsp-plug.in/lltl/iterator.h

+26-1
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,41 @@ namespace lsp
4545
*
4646
* @param i pointer to the iterator
4747
* @param n number of steps to advance (can be negative)
48-
* @return pointer to modified raw iterator
4948
*/
5049
typedef void (*iter_move_t)(raw_iterator *i, ssize_t n);
5150

51+
/**
52+
* Get pointer to a value at which the iterator is currently pointing
53+
*
54+
* @param i pointer to the iterator
55+
* @return the actual value iterator is pointing to
56+
*/
5257
typedef void *(*iter_get_t)(raw_iterator *i);
5358

59+
/**
60+
* Compare positions of two iterators.
61+
*
62+
* @param a first iterator to compare
63+
* @param b second iterator to compare
64+
* @return comparison result
65+
*/
5466
typedef ssize_t (*iter_compare_t)(const raw_iterator *a, const raw_iterator *b);
5567

68+
/**
69+
* Compute difference in position between two iterators
70+
*
71+
* @param a first iterator to compare
72+
* @param b second iterator to compare
73+
* @return difference in position between two iterators
74+
*/
5675
typedef ssize_t (*iter_diff_t)(const raw_iterator *a, const raw_iterator *b);
5776

77+
/**
78+
* Obtain the overall number of elements in a collection the iterator is operating with
79+
*
80+
* @param i pointer to the iterator
81+
* @return number of elements in collection the iterator is operating with
82+
*/
5883
typedef size_t (*iter_count_t)(const raw_iterator *i);
5984

6085
/**

include/lsp-plug.in/lltl/phashset.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
* (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
2+
* Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
* (C) 2025 Vladimir Sadovnikov <sadko4u@gmail.com>
44
*
55
* This file is part of lsp-lltl-lib
66
* Created on: 31 июл. 2020 г.
@@ -207,9 +207,9 @@ namespace lsp
207207
* Get value by key or return default value if the value was not found
208208
* @param value the desired value
209209
* @param dfl default value to return if there is no such value in the set
210-
* @return the associated value
210+
* @return the associated value or default value if not exists
211211
*/
212-
inline V *dget(const V *key, V *dfl) const { return vcast(v.get(key, dfl)); }
212+
inline V *dget(const V *value, V *dfl) const { return vcast(v.get(value, dfl)); }
213213

214214
/**
215215
* Remove the item from set if it is present in the set, add the item if not

include/lsp-plug.in/lltl/pphash.h

-3
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ namespace lsp
275275
* Replace the entry ONLY if it exists
276276
* @param key key to use
277277
* @param value value to use
278-
* @param ok key removed from hash
279278
* @param ov value removed from hash
280279
* @return pointer to write data or NULL if no allocation possible
281280
*/
@@ -284,7 +283,6 @@ namespace lsp
284283
/**
285284
* Replace the entry ONLY if it exists
286285
* @param key key to use
287-
* @param ok old key removed from hash
288286
* @param ov old value removed from hash
289287
* @return pointer to write data or NULL if no allocation possible
290288
*/
@@ -293,7 +291,6 @@ namespace lsp
293291
/**
294292
* Remove the associated key
295293
* @param key the key to use for seacrh
296-
* @param ok key removed from hash
297294
* @param ov value removed from hash
298295
* @return true if the data has been removed
299296
*/

include/lsp-plug.in/lltl/ptrset.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
* (C) 2023 Vladimir Sadovnikov <sadko4u@gmail.com>
2+
* Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
* (C) 2025 Vladimir Sadovnikov <sadko4u@gmail.com>
44
*
55
* This file is part of lsp-lltl-lib
66
* Created on: 12 нояб. 2023 г.
@@ -202,9 +202,9 @@ namespace lsp
202202
* Get value by key or return default value if the value was not found
203203
* @param value the desired value
204204
* @param dfl default value to return if there is no such value in the set
205-
* @return the associated value
205+
* @return the associated value or default value if not exists
206206
*/
207-
inline V *dget(const V *key, V *dfl) const { return vcast(v.get(key, dfl)); }
207+
inline V *dget(const V *value, V *dfl) const { return vcast(v.get(value, dfl)); }
208208

209209
/**
210210
* Remove the item from set if it is present in the set, add the item if not
@@ -223,16 +223,13 @@ namespace lsp
223223
/**
224224
* Put the value to the set
225225
* @param value value to put
226-
* @param ov value removed from hash
227226
* @return true if value was not present in the set previously
228227
*/
229228
inline bool put(V *value) { return v.put(value); }
230229

231230
/**
232231
* Remove the pointer from set
233232
* @param value the value to remove
234-
* @param ok key removed from hash
235-
* @param ov value removed from hash
236233
* @return true if the pointer has been removed
237234
*/
238235
inline bool remove(const V *value) { return v.remove(value); }

include/lsp-plug.in/lltl/state.h

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
* (C) 2024 Vladimir Sadovnikov <sadko4u@gmail.com>
2+
* Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
* (C) 2025 Vladimir Sadovnikov <sadko4u@gmail.com>
44
*
55
* This file is part of lsp-lltl-lib
66
* Created on: 19 июн. 2024 г.
@@ -127,7 +127,6 @@ namespace lsp
127127
/**
128128
* Refresh and get current state. Call deleter for garbage and previous pending state.
129129
* This is RT-unsafe method.
130-
* @param new_state new state to set
131130
* @return pointer to current state
132131
*/
133132
inline T *pull() { return tcast(v.pull()); }
@@ -146,15 +145,13 @@ namespace lsp
146145
* This is RT-safe method that should be called only in conjunction with push().
147146
* Otherwise it won't update until garbage is properly cleaned up.
148147
*
149-
* @param new_state new state to set
150148
* @return pointer to current state
151149
*/
152150
inline T *get() { return tcast(v.get()); }
153151

154152
/**
155153
* Get current state without refresh.
156154
*
157-
* @param new_state new state to set
158155
* @return pointer to current state
159156
*/
160157
inline T *current() const { return tcast(v.current()); }

include/lsp-plug.in/lltl/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#define LSP_LLTL_LIB_MAJOR 1
2626
#define LSP_LLTL_LIB_MINOR 0
27-
#define LSP_LLTL_LIB_MICRO 23
27+
#define LSP_LLTL_LIB_MICRO 24
2828

2929
#if defined(LSP_LLTL_LIB_PUBLISHER)
3030
#define LSP_LLTL_LIB_PUBLIC LSP_EXPORT_MODIFIER

modules.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
#------------------------------------------------------------------------------
2222
# Variables that describe source code dependencies
23-
LSP_COMMON_LIB_VERSION := 1.0.40
23+
LSP_COMMON_LIB_VERSION := 1.0.41
2424
LSP_COMMON_LIB_NAME := lsp-common-lib
2525
LSP_COMMON_LIB_TYPE := src
2626
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2727
LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2828

29-
LSP_TEST_FW_VERSION := 1.0.29
29+
LSP_TEST_FW_VERSION := 1.0.30
3030
LSP_TEST_FW_NAME := lsp-test-fw
3131
LSP_TEST_FW_TYPE := src
3232
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git

project.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ ARTIFACT_ID = LSP_LLTL_LIB
2323
ARTIFACT_NAME = lsp-lltl-lib
2424
ARTIFACT_DESC = Low-Level Template Library for C++
2525
ARTIFACT_HEADERS = lsp-plug.in
26-
ARTIFACT_VERSION = 1.0.23
26+
ARTIFACT_VERSION = 1.0.24

src/test/utest/darray.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ UTEST_BEGIN("lltl", darray)
4646

4747
void dump(lltl::darray<int> &x)
4848
{
49-
for (int i=0, n=x.size(); i<n; ++i)
49+
for (size_t i=0, n=x.size(); i<n; ++i)
5050
printf("%d ", *x.get(i));
5151
printf("\n");
5252
}
@@ -729,7 +729,7 @@ UTEST_BEGIN("lltl", darray)
729729
dump(x);
730730

731731
// Reverse order
732-
for (int i=0, j=x.size()-1; i<j; ++i, --j)
732+
for (ssize_t i=0, j=x.size()-1; i<j; ++i, --j)
733733
{
734734
UTEST_ASSERT(x.xswap(i, j));
735735
}
@@ -759,8 +759,8 @@ UTEST_BEGIN("lltl", darray)
759759
// Initialize
760760
for (size_t i=0; i<sizeof(large_struct_t::data)/sizeof(int); ++i)
761761
{
762-
a->data[i] = 0x55aa0000 | i;
763-
b->data[i] = (i << 16) | 0xcc33;
762+
a->data[i] = int(0x55aa0000 | i);
763+
b->data[i] = int((i << 16) | 0xcc33);
764764
}
765765

766766
UTEST_ASSERT(x.add(a));
@@ -784,7 +784,7 @@ UTEST_BEGIN("lltl", darray)
784784

785785
int v[N];
786786
for (ssize_t i=0; i<N; ++i)
787-
v[i] = N - i;
787+
v[i] = int(N - i);
788788

789789
lltl::darray<int> a;
790790
for (ssize_t i=0; i<N; ++i)
@@ -816,7 +816,7 @@ UTEST_BEGIN("lltl", darray)
816816
printf("Testing iterator...\n");
817817
int v[N];
818818
for (ssize_t i=0; i<N; ++i)
819-
v[i] = i;
819+
v[i] = int(i);
820820

821821
lltl::darray<int> a;
822822
for (ssize_t i=0; i<N; ++i)

src/test/utest/parray.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
* (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
2+
* Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
* (C) 2025 Vladimir Sadovnikov <sadko4u@gmail.com>
44
*
55
* This file is part of lsp-lltl-lib
66
* Created on: 8 апр. 2020 г.
@@ -41,7 +41,7 @@ UTEST_BEGIN("lltl", parray)
4141

4242
void dump(lltl::parray<int> &x)
4343
{
44-
for (int i=0, n=x.size(); i<n; ++i)
44+
for (size_t i=0, n=x.size(); i<n; ++i)
4545
printf("%d ", *x.get(i));
4646
printf("\n");
4747
}
@@ -66,8 +66,8 @@ UTEST_BEGIN("lltl", parray)
6666
{
6767
printf("Testing single operations on parray...\n");
6868
int array[0x20];
69-
for (int i=0, n=sizeof(array)/sizeof(int); i<n; ++i)
70-
array[i] = i;
69+
for (size_t i=0, n=sizeof(array)/sizeof(int); i<n; ++i)
70+
array[i] = int(i);
7171
int *s = array;
7272

7373
lltl::parray<int> x;
@@ -165,8 +165,8 @@ UTEST_BEGIN("lltl", parray)
165165
{
166166
printf("Testing single operations on parray with copying...\n");
167167
int array[0x20];
168-
for (int i=0, n=sizeof(array)/sizeof(int); i<n; ++i)
169-
array[i] = i;
168+
for (size_t i=0, n=sizeof(array)/sizeof(int); i<n; ++i)
169+
array[i] = int(i);
170170
int *s = array;
171171

172172
lltl::parray<int> x;
@@ -317,8 +317,8 @@ UTEST_BEGIN("lltl", parray)
317317
{
318318
printf("Testing multiple operations on darray...\n");
319319
int array[0x20];
320-
for (int i=0, n=sizeof(array)/sizeof(int); i<n; ++i)
321-
array[i] = i;
320+
for (size_t i=0, n=sizeof(array)/sizeof(int); i<n; ++i)
321+
array[i] = int(i);
322322
int *s = array;
323323

324324
lltl::parray<int> x;
@@ -405,8 +405,8 @@ UTEST_BEGIN("lltl", parray)
405405
{
406406
printf("Testing multiple operations on darray with copying...\n");
407407
int array[0x20];
408-
for (int i=0, n=sizeof(array)/sizeof(int); i<n; ++i)
409-
array[i] = i;
408+
for (size_t i=0, n=sizeof(array)/sizeof(int); i<n; ++i)
409+
array[i] = int(i);
410410
int *s = array;
411411

412412
lltl::parray<int> x;
@@ -733,7 +733,7 @@ UTEST_BEGIN("lltl", parray)
733733
dump(x);
734734

735735
// Reverse order
736-
for (int i=0, j=x.size()-1; i<j; ++i, --j)
736+
for (ssize_t i=0, j=x.size()-1; i<j; ++i, --j)
737737
{
738738
UTEST_ASSERT(x.xswap(i, j));
739739
}
@@ -754,7 +754,7 @@ UTEST_BEGIN("lltl", parray)
754754

755755
int v[N];
756756
for (ssize_t i=0; i<N; ++i)
757-
v[i] = N - i;
757+
v[i] = int(N - i);
758758

759759
lltl::parray<int> a;
760760
for (ssize_t i=0; i<N; ++i)
@@ -786,7 +786,7 @@ UTEST_BEGIN("lltl", parray)
786786
printf("Testing iterator...\n");
787787
int v[N];
788788
for (ssize_t i=0; i<N; ++i)
789-
v[i] = i;
789+
v[i] = int(i);
790790

791791
lltl::parray<int> a;
792792
for (ssize_t i=0; i<N; ++i)

src/test/utest/phashset.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ namespace lsp
3434
int v;
3535

3636
explicit item_t(int x): v(x) {}
37+
explicit item_t(size_t x): v(int(x)) {}
3738
} item_t;
3839
}
3940

0 commit comments

Comments
 (0)