Merge pull request #625 from redboltz/update_to_215

Updated the version to 2.1.5.
2025-10-21 07:45:02 +02:00 · 2017-08-05 00:02:07 +09:00 · 2017-08-04 23:07:27 +09:00 · 2017-08-04 22:37:44 +09:00 · 2017-08-04 14:41:37 +02:00 · 2017-08-04 08:14:43 +09:00
6 changed files with 26 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
-# 2017-08-03 version 2.1.4
+# 2017-08-04 version 2.1.5
+  * Improve cross platform configuration (#624)
  * Add boost asio examples (including zlib) (#610)
  * Remove some warnings (#611)
  * Fix unpack visitor to treat float32/64 correctly (#613)
@@ -6,6 +7,9 @@
  * Fix alignment problem on some platform (#617, #518)
  * Fix conflict std::tuple, std::pair, and boost::fusion::sequence problem (#619)

+# 2017-08-03 version 2.1.4 (Invalid)
+  * See https://github.com/msgpack/msgpack-c/issues/623
+
 # 2017-06-15 version 2.1.3
  * Improve build system (#603)
  * Add C++17 adaptors `std::optional` and `std::string_view`. (#607, #608)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 `msgpack` for C/C++
 ===================

-Version 2.1.4 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
+Version 2.1.5 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)

 It's like JSON but small and fast.

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.1.4.{build}
+version: 2.1.5.{build}

 image:
 - Visual Studio 2015
--- a/include/msgpack/version_master.h
+++ b/include/msgpack/version_master.h
@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    2
 #define MSGPACK_VERSION_MINOR    1
-#define MSGPACK_VERSION_REVISION 4
+#define MSGPACK_VERSION_REVISION 5
--- a/include/msgpack/vrefbuffer.h
+++ b/include/msgpack/vrefbuffer.h
@@ -13,7 +13,7 @@
 #include "zone.h"
 #include <stdlib.h>

-#if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__)
+#if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__QNXTO__)
 #include <sys/uio.h>
 #else
 struct iovec {
--- a/update_version.sh
+++ b/update_version.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 version" >&2
+    exit 1
+fi
+
+major=`echo $1 | sed -e "s/^\([0-9]*\)\.[0-9]*\.[0-9]*/\1/"`
+minor=`echo $1 | sed -e "s/^[0-9]*\.\([0-9]*\)\.[0-9]*/\1/"`
+revision=`echo $1 | sed -e "s/^[0-9]*\.[0-9]*\.\([0-9]*\)/\1/"`
+
+sed -i -e "s/^\(#define MSGPACK_VERSION_MAJOR[[:space:]]*\)[0-9]*/\1$major/" include/msgpack/version_master.h
+sed -i -e "s/^\(#define MSGPACK_VERSION_MINOR[[:space:]]*\)[0-9]*/\1$minor/" include/msgpack/version_master.h
+sed -i -e "s/^\(#define MSGPACK_VERSION_REVISION[[:space:]]*\)[0-9]*/\1$revision/" include/msgpack/version_master.h
+
+sed -i -e "s/\(^Version \)[0-9]*\.[0-9]*\.[0-9]*/\1$1/" README.md
+sed -i -e "s/\(^version: \)[0-9]*\.[0-9]*\.[0-9]*/\1$1/" appveyor.yml
Author	SHA1	Message	Date
Takatoshi Kondo	7a98138f27	Merge pull request #625 from redboltz/update_to_215 Updated the version to 2.1.5.	2017-08-05 00:02:07 +09:00
Takatoshi Kondo	cd4e0bda57	Updated the version to 2.1.5. Version 2.1.4 will be removed. See https://github.com/msgpack/msgpack-c/issues/623	2017-08-04 23:07:27 +09:00
Takatoshi Kondo	1ad2db0c42	Merge pull request #624 from mkaes/master Add defines for QNX build	2017-08-04 22:37:44 +09:00
Michael Kaes	96a76a7a5c	Add defines for QNX build	2017-08-04 14:41:37 +02:00
Takatoshi Kondo	bc964bd847	Merge pull request #622 from redboltz/add_version_updater Added version updating script.	2017-08-04 08:14:43 +09:00
Takatoshi Kondo	12604b5c8e	Added version updating script.	2017-08-04 08:13:48 +09:00