From ddb884e9cd082632bbdbdd8ce5475a89bbd5a478 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Tue, 2 Apr 2024 11:14:58 +0900 Subject: Update the version to 6.1.1. --- CHANGELOG.md | 5 +++++ README.md | 2 +- appveyor.yml | 2 +- include/msgpack/version_master.hpp | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73199b01..68efc57c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2024-04-02 version 6.1.1 + * Fix compilation error when std::variant has the same types (#1112) + * Improve CI (#1090, #1110) + * Fix to avoid common function name's (has_as::check) ambiguity/conflict with other libraries' macros (#1085) + # 2023-07-08 version 6.1.0 * Remove dependency on boost in chrono.hpp (#1076) * Add support for std::variant behavior (#1075) diff --git a/README.md b/README.md index cf578c54..31d29e80 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ `msgpack` for C++ =================== -Version 6.1.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master) +Version 6.1.1 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master) [![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master) It's like JSON but smaller and faster. diff --git a/appveyor.yml b/appveyor.yml index 8ec762fc..bcd23d81 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 6.1.0.{build} +version: 6.1.1.{build} branches: only: diff --git a/include/msgpack/version_master.hpp b/include/msgpack/version_master.hpp index ad76f737..e844bcd1 100644 --- a/include/msgpack/version_master.hpp +++ b/include/msgpack/version_master.hpp @@ -1,3 +1,3 @@ #define MSGPACK_VERSION_MAJOR 6 #define MSGPACK_VERSION_MINOR 1 -#define MSGPACK_VERSION_REVISION 0 +#define MSGPACK_VERSION_REVISION 1 -- cgit v1.2.3