Skip to content

Commit

Permalink
* adapt to version change in stacktrace
Browse files Browse the repository at this point in the history
  • Loading branch information
mulle-nat committed Dec 11, 2024
1 parent d205799 commit 6d3fa6a
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .mulle/share/env/environment-plugin.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .mulle/share/env/version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .mulle/share/sde/version/mulle-sde/cmake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required( VERSION 3.14)

project( mulle-testallocator VERSION 5.1.0 LANGUAGES C)
project( mulle-testallocator VERSION 5.1.1 LANGUAGES C)


### mulle-sde environment
Expand Down
4 changes: 4 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 5.1.1

* adapt to version change in stacktrace

## 5.1.0


Expand Down
13 changes: 9 additions & 4 deletions cmake/share/InstallRpath.cmake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/mulle-testallocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

#include "mulle-testallocator-struct.h"

#define MULLE__TESTALLOCATOR_VERSION ((5UL << 20) | (1 << 8) | 0)
#define MULLE__TESTALLOCATOR_VERSION ((5UL << 20) | (1 << 8) | 1)

MULLE__TESTALLOCATOR_GLOBAL struct _mulle_testallocator_config mulle_testallocator_config;
MULLE__TESTALLOCATOR_GLOBAL struct mulle_allocator mulle_testallocator;
Expand Down
4 changes: 2 additions & 2 deletions src/reflect/_mulle-testallocator-versioncheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@

#if defined( MULLE__STACKTRACE_VERSION)
# ifndef MULLE__STACKTRACE_VERSION_MIN
# define MULLE__STACKTRACE_VERSION_MIN ((0UL << 20) | (2 << 8) | 9)
# define MULLE__STACKTRACE_VERSION_MIN ((0UL << 20) | (3 << 8) | 0)
# endif
# ifndef MULLE__STACKTRACE_VERSION_MAX
# define MULLE__STACKTRACE_VERSION_MAX ((0UL << 20) | (3 << 8) | 0)
# define MULLE__STACKTRACE_VERSION_MAX ((0UL << 20) | (4 << 8) | 0)
# endif
# if MULLE__STACKTRACE_VERSION < MULLE__STACKTRACE_VERSION_MIN
# error "mulle-stacktrace is too old"
Expand Down
2 changes: 1 addition & 1 deletion test/.mulle/share/env/environment-plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES'
#
#
#
export MULLE_SDE_INSTALLED_VERSION="3.2.0"
export MULLE_SDE_INSTALLED_VERSION="3.2.2"


2 changes: 1 addition & 1 deletion test/.mulle/share/env/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.3.0
5.3.1

0 comments on commit 6d3fa6a

Please sign in to comment.