Skip to content

Commit 170f742

Browse files
committed
fix some very pedantic warnings
1 parent 2bfa6c3 commit 170f742

22 files changed

+71
-57
lines changed

.mulle/share/env/environment-plugin.sh

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/share/env/environment.sh

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/share/env/tool-plugin

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/share/env/version

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/share/sde/version/mulle-c/c-cmake

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/share/sde/version/mulle-sde/cmake

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
cmake_minimum_required( VERSION 3.13)
1010

11-
project( mulle-linkedlist VERSION 0.0.4 LANGUAGES C)
11+
project( mulle-linkedlist VERSION 0.0.5 LANGUAGES C)
1212

1313
# if use embedded project with symlinks and you want to distribute their
1414
# headers you probably need to turn this on

clib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name" : "mulle-linkedlist",
3-
"version" : "0.0.4",
3+
"version" : "0.0.5",
44
"description" : "🔂 mulle-linkedlist a wait and lock-free linked list",
55
"keywords" : [],
66
"license" : "BSD-3-Clause",

cmake/reflect/_Headers.cmake

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmake/share/CompilerWarningsC.cmake

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmake/share/Environment.cmake

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmake/share/InstallRpath.cmake

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mulle-concurrent-linkedlist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ struct _mulle_concurrent_linkedlistentry *
7878
// chain together
7979
if( prev_chain)
8080
{
81-
for( tail = chain; next = tail->_next; tail = next)
81+
for( tail = chain; (next = tail->_next); tail = next)
8282
{
8383
assert( next != prev_chain);
8484
MULLE_THREAD_UNPLEASANT_RACE_YIELD();

src/mulle-linkedlist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <string.h>
4141
#include <assert.h>
4242

43-
#define MULLE__LINKEDLIST_VERSION ((0UL << 20) | (0 << 8) | 4)
43+
#define MULLE__LINKEDLIST_VERSION ((0UL << 20) | (0 << 8) | 5)
4444

4545

4646
static inline unsigned int mulle_linkedlist_get_version_major( void)

src/reflect/_mulle-linkedlist-versioncheck.h

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,56 @@
77

88
#if defined( MULLE__ALLOCATOR_VERSION)
99
# ifndef MULLE__ALLOCATOR_VERSION_MIN
10-
# define MULLE__ALLOCATOR_VERSION_MIN ((7UL << 20) | (0 << 8) | 0)
10+
# define MULLE__ALLOCATOR_VERSION_MIN ((7UL << 20) | (0 << 8) | 2)
1111
# endif
1212
# ifndef MULLE__ALLOCATOR_VERSION_MAX
1313
# define MULLE__ALLOCATOR_VERSION_MAX ((8UL << 20) | (0 << 8) | 0)
1414
# endif
15-
# if MULLE__ALLOCATOR_VERSION < MULLE__ALLOCATOR_VERSION_MIN
16-
# error "mulle-allocator is too old"
17-
# endif
18-
# if MULLE__ALLOCATOR_VERSION >= MULLE__ALLOCATOR_VERSION_MAX
19-
# error "mulle-allocator is too new"
15+
# if MULLE__ALLOCATOR_VERSION < MULLE__ALLOCATOR_VERSION_MIN || MULLE__ALLOCATOR_VERSION >= MULLE__ALLOCATOR_VERSION_MAX
16+
# pragma message("MULLE__ALLOCATOR_VERSION is " MULLE_C_STRINGIFY_MACRO( MULLE__ALLOCATOR_VERSION))
17+
# pragma message("MULLE__ALLOCATOR_VERSION_MIN is " MULLE_C_STRINGIFY_MACRO( MULLE__ALLOCATOR_VERSION_MIN))
18+
# pragma message("MULLE__ALLOCATOR_VERSION_MAX is " MULLE_C_STRINGIFY_MACRO( MULLE__ALLOCATOR_VERSION_MAX))
19+
# if MULLE__ALLOCATOR_VERSION < MULLE__ALLOCATOR_VERSION_MIN
20+
# error "mulle-allocator is too old"
21+
# else
22+
# error "mulle-allocator is too new"
23+
# endif
2024
# endif
2125
#endif
22-
2326
#if defined( MULLE__C11_VERSION)
2427
# ifndef MULLE__C11_VERSION_MIN
25-
# define MULLE__C11_VERSION_MIN ((4UL << 20) | (6 << 8) | 0)
28+
# define MULLE__C11_VERSION_MIN ((4UL << 20) | (6 << 8) | 1)
2629
# endif
2730
# ifndef MULLE__C11_VERSION_MAX
2831
# define MULLE__C11_VERSION_MAX ((5UL << 20) | (0 << 8) | 0)
2932
# endif
30-
# if MULLE__C11_VERSION < MULLE__C11_VERSION_MIN
31-
# error "mulle-c11 is too old"
32-
# endif
33-
# if MULLE__C11_VERSION >= MULLE__C11_VERSION_MAX
34-
# error "mulle-c11 is too new"
33+
# if MULLE__C11_VERSION < MULLE__C11_VERSION_MIN || MULLE__C11_VERSION >= MULLE__C11_VERSION_MAX
34+
# pragma message("MULLE__C11_VERSION is " MULLE_C_STRINGIFY_MACRO( MULLE__C11_VERSION))
35+
# pragma message("MULLE__C11_VERSION_MIN is " MULLE_C_STRINGIFY_MACRO( MULLE__C11_VERSION_MIN))
36+
# pragma message("MULLE__C11_VERSION_MAX is " MULLE_C_STRINGIFY_MACRO( MULLE__C11_VERSION_MAX))
37+
# if MULLE__C11_VERSION < MULLE__C11_VERSION_MIN
38+
# error "mulle-c11 is too old"
39+
# else
40+
# error "mulle-c11 is too new"
41+
# endif
3542
# endif
3643
#endif
37-
3844
#if defined( MULLE__THREAD_VERSION)
3945
# ifndef MULLE__THREAD_VERSION_MIN
40-
# define MULLE__THREAD_VERSION_MIN ((4UL << 20) | (6 << 8) | 0)
46+
# define MULLE__THREAD_VERSION_MIN ((4UL << 20) | (6 << 8) | 2)
4147
# endif
4248
# ifndef MULLE__THREAD_VERSION_MAX
4349
# define MULLE__THREAD_VERSION_MAX ((5UL << 20) | (0 << 8) | 0)
4450
# endif
45-
# if MULLE__THREAD_VERSION < MULLE__THREAD_VERSION_MIN
46-
# error "mulle-thread is too old"
47-
# endif
48-
# if MULLE__THREAD_VERSION >= MULLE__THREAD_VERSION_MAX
49-
# error "mulle-thread is too new"
51+
# if MULLE__THREAD_VERSION < MULLE__THREAD_VERSION_MIN || MULLE__THREAD_VERSION >= MULLE__THREAD_VERSION_MAX
52+
# pragma message("MULLE__THREAD_VERSION is " MULLE_C_STRINGIFY_MACRO( MULLE__THREAD_VERSION))
53+
# pragma message("MULLE__THREAD_VERSION_MIN is " MULLE_C_STRINGIFY_MACRO( MULLE__THREAD_VERSION_MIN))
54+
# pragma message("MULLE__THREAD_VERSION_MAX is " MULLE_C_STRINGIFY_MACRO( MULLE__THREAD_VERSION_MAX))
55+
# if MULLE__THREAD_VERSION < MULLE__THREAD_VERSION_MIN
56+
# error "mulle-thread is too old"
57+
# else
58+
# error "mulle-thread is too new"
59+
# endif
5060
# endif
5161
#endif
5262

test/.mulle/etc/sourcetree/config

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.mulle/share/env/environment-plugin.sh

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.mulle/share/env/environment.sh

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.mulle/share/env/tool-plugin

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.mulle/share/env/version

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.mulle/share/sde/version/mulle-sde/base-test-runtime

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.mulle/share/sde/version/mulle-sde/c-test-runtime

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)