Merge pull request #785 from redboltz/update_version_3.2.0

Updated the version to 3.2.0.
Merge pull request #784 from redboltz/more_warning_fix
2025-10-21 07:45:02 +02:00 · 2019-05-27 22:19:57 +09:00 · 2019-05-27 21:34:47 +09:00 · 2019-05-27 18:37:24 +09:00 · 2019-05-27 17:35:22 +09:00 · 2019-05-27 17:05:55 +09:00
305 changed files with 9822 additions and 1516 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: cpp
 sudo: false
+dist: trusty

 install:
 - export BASE=`pwd`
@@ -9,8 +10,9 @@ install:
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./cmake-3.7.1-Linux-x86_64.sh --prefix=${BASE}/usr --skip-license; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH="${BASE}/usr/bin:$PATH"; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export LD_LIBRARY_PATH="${BASE}/usr/lib:$LD_LIBRARY_PATH"; fi
- - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
- - if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
+ - if [ "$CXX" == "g++" ]; then export CXX="g++-7" CC="gcc-7"; fi
+ - if [ "$CXX" == "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-5.0" CC="clang-5.0"; fi
+ - if [ "$CXX" == "g++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then cd /usr/include/c++/$(g++ -v 2>&1 | grep version | awk '{print $3}')/bits; ln -s ../ext/atomicity.h .; cd ${BASE}/usr; fi
 #gtest
 - wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip
 - unzip -q googletest-release-1.7.0.zip
@@ -24,22 +26,24 @@ install:
 - mkdir -p ${BASE}/usr/lib
 - mv *.a ${BASE}/usr/lib
 - cd ..
-# valgrind
- - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget http://valgrind.org/downloads/valgrind-3.12.0.tar.bz2 && tar xjf valgrind-3.12.0.tar.bz2 && cd valgrind-3.12.0 && ./configure --prefix=${BASE}/usr > /dev/null && make -j3 > /dev/null && make install > /dev/null && cd ..; fi
-# boost
- - if [ "$BOOST" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.zip && unzip -q boost_1_63_0.zip && cd boost_1_63_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-chrono --with-context --with-system --with-timer address-model=${ARCH} install > /dev/null && cd ..; fi
+ # valgrind
+ - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$MSGPACK_FUZZ_REGRESSION" != "ON" ]; then wget http://valgrind.org/downloads/valgrind-3.12.0.tar.bz2 && tar xjf valgrind-3.12.0.tar.bz2 && cd valgrind-3.12.0 && ./configure --prefix=${BASE}/usr > /dev/null && make -j3 > /dev/null && make install > /dev/null && cd ..; fi
+ # boost
+ - if [ "$BOOST" == "ON" ] && [ "MSGPACK_FUZZ_REGRESSION" != "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.zip && unzip -q boost_1_67_0.zip && cd boost_1_67_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-chrono --with-context --with-system --with-timer address-model=${ARCH} install > /dev/null && cd ..; fi
+ - if [ "$MSGPACK_FUZZ_REGRESSION" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.zip && unzip -q boost_1_67_0.zip && cd boost_1_67_0 && ./bootstrap.sh --with-toolset=clang && ./b2 clean && ./b2 -j$(nproc) --prefix=${BASE}/usr --with-system --with-filesystem address-model=${ARCH} install > /dev/null && cd ..; fi
+ - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include; fi

 matrix:
  include:
    - os: osx
      compiler: clang
-      env: ACTION="ci/build_cmake.sh"  CXX11="ON" ARCH="64"   BOOST="ON" SHARED="ON"  CHAR_SIGN="unsigned" API_VERSION="1"
+      env: ACTION="ci/build_cmake.sh"  CXX17="ON" ARCH="64"   BOOST="ON" SHARED="ON"  CHAR_SIGN="unsigned" API_VERSION="1"
    - os: osx
      compiler: clang
-      env:  ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64"   BOOST="ON" SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="2"
+      env:  ACTION="ci/build_cmake.sh" CXX17="ON" ARCH="64"   BOOST="ON" SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="3"
    - os: osx
      compiler: clang
-      env: ACTION="ci/build_cmake.sh"  CXX11="ON" ARCH="64"              SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="2"
+      env: ACTION="ci/build_cmake.sh"  CXX17="ON" ARCH="64"              SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="2"
    - os: osx
      compiler: clang
      env: ACTION="ci/build_cmake.sh"             ARCH="64"              SHARED="ON"  CHAR_SIGN="unsigned" API_VERSION="2"
@@ -50,15 +54,14 @@ matrix:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9
-            - llvm-toolchain-precise
+            - llvm-toolchain-trusty-5.0
          packages:
            - g++-multilib
            - gcc-multilib
-            - gcc-5-multilib
-            - g++-5-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
            - bzip2
-            - clang-3.9
+            - clang-5.0
            - libc6-dbg
    - os: linux
      compiler: clang
@@ -67,61 +70,60 @@ matrix:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9
-            - llvm-toolchain-precise
+            - llvm-toolchain-trusty-5.0
          packages:
            - g++-multilib
            - gcc-multilib
-            - gcc-5-multilib
-            - g++-5-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
            - lib32stdc++6-6-dbg
            - lib32gcc1
            - libc6-i386
            - lib32z1-dev
+            - zlib1g-dev
            - bzip2
-            - clang-3.9
+            - clang-5.0
            - libc6-dbg
    - os: linux
      compiler: clang
-      env: ACTION="ci/build_cmake.sh"  CXX11="ON" ARCH="64"   BOOST="ON" SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="2" X3_PARSE="ON"
+      env: ACTION="ci/build_cmake.sh"  CXX17="ON" ARCH="64"   BOOST="ON" SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="3" X3_PARSE="ON"
      addons:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9
-            - llvm-toolchain-precise
+            - llvm-toolchain-trusty-5.0
          packages:
            - g++-multilib
            - gcc-multilib
-            - gcc-5-multilib
-            - g++-5-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
            - bzip2
-            - clang-3.9
+            - clang-5.0
            - libc6-dbg
    - os: linux
      compiler: clang
-      env: ACTION="ci/build_cmake.sh"  CXX11="ON" ARCH="32"              SHARED="OFF" CHAR_SIGN="unsigned" API_VERSION="2"
+      env: ACTION="ci/build_cmake.sh"  CXX17="ON" ARCH="32"              SHARED="OFF" CHAR_SIGN="unsigned" API_VERSION="2"
      addons:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9
-            - llvm-toolchain-precise
+            - llvm-toolchain-trusty-5.0
          packages:
            - g++-multilib
            - gcc-multilib
-            - gcc-5-multilib
-            - g++-5-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
            - lib32stdc++6-6-dbg
            - lib32gcc1
            - libc6-i386
            - lib32z1-dev
+            - zlib1g-dev
            - bzip2
-            - clang-3.9
+            - clang-5.0
            - libc6-dbg
    - os: linux
      compiler: gcc
-      env: ACTION="ci/build_cmake.sh"  CXX11="ON" ARCH="64"              SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="2"
+      env: ACTION="ci/build_cmake.sh"  CXX17="ON" ARCH="64"              SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="2"
      addons:
        apt:
          sources:
@@ -129,13 +131,13 @@ matrix:
          packages:
            - g++-multilib
            - gcc-multilib
-            - gcc-6-multilib
-            - g++-6-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
            - bzip2
            - libc6-dbg
    - os: linux
      compiler: gcc
-      env: ACTION="ci/build_cmake.sh"  CXX11="ON" ARCH="32"   BOOST="ON" SHARED="ON"  CHAR_SIGN="unsigned" API_VERSION="2" X3_PARSE="ON"
+      env: ACTION="ci/build_cmake.sh"  CXX17="ON" ARCH="32"   BOOST="ON" SHARED="ON"  CHAR_SIGN="unsigned" API_VERSION="3" X3_PARSE="ON"
      addons:
        apt:
          sources:
@@ -143,12 +145,13 @@ matrix:
          packages:
            - g++-multilib
            - gcc-multilib
-            - gcc-6-multilib
-            - g++-6-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
            - lib32stdc++6-6-dbg
            - lib32gcc1
            - libc6-i386
            - lib32z1-dev
+            - zlib1g-dev
            - bzip2
            - libc6-dbg
    - os: linux
@@ -161,8 +164,8 @@ matrix:
          packages:
            - g++-multilib
            - gcc-multilib
-            - gcc-6-multilib
-            - g++-6-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
            - bzip2
            - libc6-dbg
    - os: linux
@@ -175,12 +178,13 @@ matrix:
          packages:
            - g++-multilib
            - gcc-multilib
-            - gcc-6-multilib
-            - g++-6-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
            - lib32stdc++6-6-dbg
            - lib32gcc1
            - libc6-i386
            - lib32z1-dev
+            - zlib1g-dev
            - bzip2
            - libc6-dbg
    - os: linux
@@ -193,14 +197,43 @@ matrix:
          packages:
            - g++-multilib
            - gcc-multilib
-            - gcc-6-multilib
-            - g++-6-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
            - lib32stdc++6-6-dbg
            - lib32gcc1
            - libc6-i386
            - lib32z1-dev
+            - zlib1g-dev
            - bzip2
            - libc6-dbg
+    - os: linux
+      compiler: clang
+      env: ACTION="ci/build_regression.sh"         ARCH="64" SAN="UBSAN" MSGPACK_FUZZ_REGRESSION="ON"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0
+          packages:
+            - bzip2
+            - clang-5.0
+      script:
+        - CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" CMAKE_LIBRARY_PATH="${BASE}" GTEST_ROOT="${BASE}/gtest" BOOST_ROOT="${BASE}/boost" CTEST_OUTPUT_ON_FAILURE=1 MSGPACK_SAN="${SAN}" ci/build_regression.sh
+    - os: linux
+      compiler: clang
+      env: ACTION="ci/build_regression.sh"         ARCH="64" SAN="ASAN" MSGPACK_FUZZ_REGRESSION="ON"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0
+          packages:
+            - bzip2
+            - clang-5.0
+      script:
+        - CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" CMAKE_LIBRARY_PATH="${BASE}" GTEST_ROOT="${BASE}/gtest" BOOST_ROOT="${BASE}/boost" CTEST_OUTPUT_ON_FAILURE=1 MSGPACK_SAN="${SAN}" ci/build_regression.sh
+

 script:
-  - CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" CMAKE_LIBRARY_PATH="${BASE}/usr/lib:${BASE}/build" GTEST_ROOT="${BASE}/usr" BOOST_ROOT="${BASE}/usr" ${ACTION}
+  - CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" CMAKE_LIBRARY_PATH="${BASE}/usr/lib:${BASE}/build" GTEST_ROOT="${BASE}/usr" BOOST_ROOT="${BASE}/usr" CFLAGS="-Werror -g" CXXFLAGS="-Werror -g" ${ACTION}
+  - cat Files.cmake| grep ".*\.[h|hpp]" | perl -pe 's/ //g' | sort > tmp1  && find include -name "*.h" -o -name "*.hpp" | sort > tmp2 && diff tmp1 tmp2
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,76 @@
+# 2019-05-27 version 3.2.0
+
+  * Fix invalid include (#783)
+  * Add timespec support (#781)
+  * Fix unchecked fnprintf on C (#780)
+  * Improve integer overflow checking on C (#776)
+  * Fix warnings on `-Wconversion` (#770, #777, #784)
+  * Fix invalid passed by value on aligned_zone_size_visitor (#764)
+  * Improve windows support (#757, #779)
+  * Fix msgpack::object size caluclation error (#754)
+  * Fix memory error on example code (#753)
+  * Fix redundant memory allocation on C (#747)
+  * Fix msgpack::type::tuple base class conversion (#743)
+
+# 2018-09-09 version 3.1.1
+
+  * Add force endian set functionality (#736)
+  * Fix vrefbuffer memory management problem (#733)
+  * Fix msvc specific problem (#731, #732)
+  * Update boost from 1.61.0 to 1.68.0 (#730)
+  * Fix msgpack_timestamp type mismatch bug (#726)
+
+# 2018-08-10 version 3.1.0
+
+  * Improve documents (#687, #718)
+  * Add fuzzer support (#689)
+  * Fix msgpack::object union member access bug (#694)
+  * Improve cross platform configuration (#704)
+  * Fix out of range dereference bug of EXT (#705)
+  * Add timestamp support. std::chrono::system_clock::time_point is mapped to TIMESTAMP (#706)
+  * Add minimal timestamp support for C. The type `msgpack_timestamp` and the function `msgpack_object_to_timestamp()` are introduced (#707)
+  * Improve MSGPACK_DEFINE family name confliction probability (#710)
+  * Add no static-library build option (BUILD_SHARED_LIBS=ON) (#713, #717, #722)
+  * Add header only cmake target (#721)
+  * Add `std::byte` adaptor (#719)
+  * Remove some warnings (#720)
+
+# 2018-05-12 version 3.0.1
+
+  * Add fuzz directory to release tar ball (#686)
+  * Add include file checking for X-Code (#683)
+
+# 2018-05-09 version 3.0.0
+
+## << breaking changes >>
+
+  * Change offset parameter updating rule. If parse error happens, offset is updated to the error position. (#639, #666)
+
+## << other updates >>
+
+  * Improve cross platform configuration (#655, #677)
+  * Improve build system (#647)
+  * Improve user class adaptor (#645, #673)
+  * Improve msgpack::object visitation logic (#676)
+  * Remove some warnings (#641, 659)
+  * Add `->` and `*` operators to object_handle (#635)
+  * Improve CI environment (#631, #634, #643, #657, #662, #668)
+  * Improve documents (#630, #661)
+  * Refactoring (#670)
+  * Add OSS-Fuzz support (#672, #674, #675, #678)
+
+# 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)
+  * Improve documents (#616)
+  * 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/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,7 @@ ENDIF ()
 IF (MSGPACK_DEFAULT_API_VERSION)
   SET (CMAKE_CXX_FLAGS "-DMSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION} ${CMAKE_CXX_FLAGS}")
 ELSE ()
-   SET (CMAKE_CXX_FLAGS "-DMSGPACK_DEFAULT_API_VERSION=2 ${CMAKE_CXX_FLAGS}")
+   SET (CMAKE_CXX_FLAGS "-DMSGPACK_DEFAULT_API_VERSION=3 ${CMAKE_CXX_FLAGS}")
 ENDIF ()

 FILE (GLOB_RECURSE PREDEF_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/predef/include/boost ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/predef/include/boost/*.h)
@@ -150,12 +150,40 @@ ENDFOREACH ()
 FIND_PACKAGE (GTest)
 FIND_PACKAGE (ZLIB)
 FIND_PACKAGE (Threads)
-IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND)
+IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND AND NOT "${MSGPACK_FUZZ_REGRESSION}" STREQUAL "ON")
    OPTION (MSGPACK_BUILD_TESTS "Build msgpack tests." ON)
 ENDIF ()

+IF (DEFINED BUILD_SHARED_LIBS)
+    IF (BUILD_SHARED_LIBS)
+        IF (DEFINED MSGPACK_ENABLE_SHARED AND NOT MSGPACK_ENABLE_SHARED)
+            MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to ON by BUILD_SHARED_LIBS")
+        ENDIF ()
+        SET (MSGPACK_ENABLE_SHARED ON)
+        IF (DEFINED MSGPACK_ENABLE_STATIC AND MSGPACK_ENABLE_STATIC)
+            MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to OFF by BUILD_SHARED_LIBS")
+        ENDIF ()
+        SET (MSGPACK_ENABLE_STATIC OFF)
+    ELSE ()
+        IF (DEFINED MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_SHARED)
+            MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to OFF by BUILD_SHARED_LIBS")
+        ENDIF ()
+        SET (MSGPACK_ENABLE_SHARED OFF)
+        IF (DEFINED MSGPACK_ENABLE_STATIC AND NOT MSGPACK_ENABLE_STATIC)
+            MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to ON by BUILD_SHARED_LIBS")
+        ENDIF ()
+        SET (MSGPACK_ENABLE_STATIC ON)
+    ENDIF ()
+ELSE ()
+    IF (NOT DEFINED MSGPACK_ENABLE_SHARED)
+        SET (MSGPACK_ENABLE_SHARED ON)
+    ENDIF ()
+    IF (NOT DEFINED MSGPACK_ENABLE_STATIC)
+        SET (MSGPACK_ENABLE_STATIC ON)
+    ENDIF ()
+ENDIF ()
+
 OPTION (MSGPACK_ENABLE_CXX "Enable C++ interface." ON)
-OPTION (MSGPACK_ENABLE_SHARED "Build shared libaries in addition to static libraries." ON)

 INCLUDE (CheckCXXSourceCompiles)
 CHECK_CXX_SOURCE_COMPILES ("
@@ -187,6 +215,8 @@ IF (MSGPACK_ENABLE_SHARED)
        ${msgpackc_HEADERS}
    )

+    SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0)
+
    TARGET_INCLUDE_DIRECTORIES (msgpackc
        PUBLIC
            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -197,35 +227,60 @@ IF (MSGPACK_ENABLE_SHARED)
    )
 ENDIF ()

-ADD_LIBRARY (msgpackc-static STATIC
-    ${msgpackc_SOURCES}
-    ${msgpackc_HEADERS}
-)
+IF (MSGPACK_ENABLE_CXX AND ((CMAKE_VERSION VERSION_GREATER 3.0) OR (CMAKE_VERSION VERSION_EQUAL 3.0)))
+    ADD_LIBRARY (msgpackc-cxx INTERFACE)

-TARGET_INCLUDE_DIRECTORIES (msgpackc-static
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-        $<INSTALL_INTERFACE:include>
-    PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-IF (NOT MSGPACK_ENABLE_SHARED)
-    # Add alias for subdirectories
-    ADD_LIBRARY (msgpackc ALIAS msgpackc-static)
+    TARGET_INCLUDE_DIRECTORIES (msgpackc-cxx
+        INTERFACE
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+            $<INSTALL_INTERFACE:include>
+    )
 ENDIF ()

-SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
-IF (MSGPACK_ENABLE_SHARED)
-    IF (MSVC)
-        SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
-    ELSEIF (MINGW)
-        SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX ".dll.a")
+IF (MSGPACK_ENABLE_STATIC)
+    ADD_LIBRARY (msgpackc-static STATIC
+        ${msgpackc_SOURCES}
+        ${msgpackc_HEADERS}
+    )
+
+    TARGET_INCLUDE_DIRECTORIES (msgpackc-static
+        PUBLIC
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+            $<INSTALL_INTERFACE:include>
+        PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
+    IF (NOT MSGPACK_ENABLE_SHARED)
+        # Add alias for subdirectories
+        ADD_LIBRARY (msgpackc ALIAS msgpackc-static)
+    ENDIF ()
+
+    SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
+
+    IF (MSGPACK_ENABLE_SHARED)
+        IF (MSVC)
+            SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
+        ELSEIF (MINGW)
+            SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX ".dll.a")
+        ENDIF ()
    ENDIF ()
-    SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0)
 ENDIF ()

+# enable regression testing
+IF ("${MSGPACK_FUZZ_REGRESSION}" STREQUAL "ON" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+   SET (CMAKE_CXX_FLAGS "-DMSGPACK_USE_BOOST ${CMAKE_CXX_FLAGS}")
+   SET (Boost_USE_MULTITHREADED      ON)
+   SET (Boost_USE_STATIC_RUNTIME    OFF)
+
+   enable_testing ()
+   ADD_SUBDIRECTORY (fuzz)
+   SET (MSGPACK_BUILD_EXAMPLES OFF)
+ENDIF ()
+
+
 IF (MSGPACK_BUILD_TESTS)
    ENABLE_TESTING ()
    # MEMORYCHECK_COMMAND_OPTIONS needs to place prior to CTEST_MEMORYCHECK_COMMAND
@@ -237,16 +292,20 @@ ENDIF ()

 IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
    IF (MSGPACK_ENABLE_SHARED)
-        SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC")
+        SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC")
+    ENDIF ()
+    IF (MSGPACK_ENABLE_STATIC)
+       SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" )
    ENDIF ()
-    SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
 ENDIF ()

 IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
    IF (MSGPACK_ENABLE_SHARED)
        SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
    ENDIF ()
-    SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+    IF (MSGPACK_ENABLE_STATIC)
+        SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+    ENDIF ()
 ENDIF ()

 IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
@@ -259,7 +318,12 @@ ENDIF ()

 IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC90" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC10")
    SET_SOURCE_FILES_PROPERTIES(${msgpackc_SOURCES} PROPERTIES LANGUAGE CXX)
-ENDIF()
+ENDIF ()
+
+IF ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "sparc")
+    SET (CMAKE_C_FLAGS   "-DMSGPACK_ZONE_ALIGN=8 ${CMAKE_C_FLAGS}")
+    SET (CMAKE_CXX_FLAGS "-DMSGPACK_ZONE_ALIGN=8 ${CMAKE_CXX_FLAGS}")
+ENDIF ()

 IF (NOT DEFINED CMAKE_INSTALL_BINDIR)
    SET(CMAKE_INSTALL_BINDIR bin)
@@ -274,9 +338,15 @@ IF (MSGPACK_BUILD_EXAMPLES)
 ENDIF ()

 IF (MSGPACK_ENABLE_SHARED)
-    SET (MSGPACK_INSTALLTARGETS msgpackc msgpackc-static)
-ELSE()
-    SET (MSGPACK_INSTALLTARGETS msgpackc-static)
+    SET (MSGPACK_INSTALLTARGETS msgpackc)
+ENDIF ()
+
+IF (MSGPACK_ENABLE_CXX AND ((CMAKE_VERSION VERSION_GREATER 3.0) OR (CMAKE_VERSION VERSION_EQUAL 3.0)))
+    LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-cxx)
+ENDIF ()
+
+IF (MSGPACK_ENABLE_STATIC)
+    LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-static)
 ENDIF ()

 INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-targets
@@ -302,6 +372,7 @@ IF (DOXYGEN_FOUND)
        COMMAND ${CMAKE_COMMAND} -E echo "INPUT              = ${CMAKE_CURRENT_SOURCE_DIR}/include" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
        COMMAND ${CMAKE_COMMAND} -E echo "EXTRACT_ALL        = YES" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
        COMMAND ${CMAKE_COMMAND} -E echo "PROJECT_NAME       = \"MessagePack for C\"" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+        COMMAND ${CMAKE_COMMAND} -E echo "STRIP_FROM_PATH    = ${CMAKE_CURRENT_SOURCE_DIR}/include" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
    )
    IF (DOXYGEN_DOT_FOUND)
        LIST (APPEND Doxyfile_c_CONTENT
@@ -320,6 +391,7 @@ IF (DOXYGEN_FOUND)
        COMMAND ${CMAKE_COMMAND} -E echo "OUTPUT_DIRECTORY   = doc_cpp" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
        COMMAND ${CMAKE_COMMAND} -E echo "INPUT              = ${CMAKE_CURRENT_SOURCE_DIR}/include" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
        COMMAND ${CMAKE_COMMAND} -E echo "EXTRACT_ALL        = YES" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+        COMMAND ${CMAKE_COMMAND} -E echo "STRIP_FROM_PATH    = ${CMAKE_CURRENT_SOURCE_DIR}/include" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
    )
    IF (DOXYGEN_DOT_FOUND)
        LIST (APPEND Doxyfile_cpp_CONTENT
--- a/2
+++ b/2
@@ -281,7 +281,7 @@ TYPEDEF_HIDES_STRUCT   = NO
 # causing a significant performance penality.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
+# a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
--- a/Files.cmake
+++ b/Files.cmake
@@ -24,6 +24,7 @@ LIST (APPEND msgpackc_HEADERS
    include/msgpack/predef/architecture/mips.h
    include/msgpack/predef/architecture/parisc.h
    include/msgpack/predef/architecture/ppc.h
+    include/msgpack/predef/architecture/ptx.h
    include/msgpack/predef/architecture/pyramid.h
    include/msgpack/predef/architecture/rs6k.h
    include/msgpack/predef/architecture/sparc.h
@@ -57,6 +58,7 @@ LIST (APPEND msgpackc_HEADERS
    include/msgpack/predef/compiler/metrowerks.h
    include/msgpack/predef/compiler/microtec.h
    include/msgpack/predef/compiler/mpw.h
+    include/msgpack/predef/compiler/nvcc.h
    include/msgpack/predef/compiler/palm.h
    include/msgpack/predef/compiler/pgi.h
    include/msgpack/predef/compiler/sgi_mipspro.h
@@ -83,12 +85,14 @@ LIST (APPEND msgpackc_HEADERS
    include/msgpack/predef/hardware/simd/x86_amd.h
    include/msgpack/predef/hardware/simd/x86_amd/versions.h
    include/msgpack/predef/language.h
+    include/msgpack/predef/language/cuda.h
    include/msgpack/predef/language/objc.h
    include/msgpack/predef/language/stdc.h
    include/msgpack/predef/language/stdcpp.h
    include/msgpack/predef/library.h
    include/msgpack/predef/library/c.h
    include/msgpack/predef/library/c/_prefix.h
+    include/msgpack/predef/library/c/cloudabi.h
    include/msgpack/predef/library/c/gnu.h
    include/msgpack/predef/library/c/uc.h
    include/msgpack/predef/library/c/vms.h
@@ -132,16 +136,25 @@ LIST (APPEND msgpackc_HEADERS
    include/msgpack/predef/os/windows.h
    include/msgpack/predef/other.h
    include/msgpack/predef/other/endian.h
+    include/msgpack/predef/other/workaround.h
    include/msgpack/predef/platform.h
+    include/msgpack/predef/platform/cloudabi.h
+    include/msgpack/predef/platform/ios.h
    include/msgpack/predef/platform/mingw.h
+    include/msgpack/predef/platform/mingw32.h
+    include/msgpack/predef/platform/mingw64.h
    include/msgpack/predef/platform/windows_desktop.h
    include/msgpack/predef/platform/windows_phone.h
    include/msgpack/predef/platform/windows_runtime.h
+    include/msgpack/predef/platform/windows_server.h
    include/msgpack/predef/platform/windows_store.h
+    include/msgpack/predef/platform/windows_system.h
+    include/msgpack/predef/platform/windows_uwp.h
    include/msgpack/predef/version.h
    include/msgpack/predef/version_number.h
    include/msgpack/sbuffer.h
    include/msgpack/sysdep.h
+    include/msgpack/timestamp.h
    include/msgpack/unpack.h
    include/msgpack/unpack_define.h
    include/msgpack/unpack_template.h
@@ -173,15 +186,20 @@ IF (MSGPACK_ENABLE_CXX)
        include/msgpack/adaptor/cpp11/array.hpp
        include/msgpack/adaptor/cpp11/array_char.hpp
        include/msgpack/adaptor/cpp11/array_unsigned_char.hpp
+        include/msgpack/adaptor/cpp11/chrono.hpp
        include/msgpack/adaptor/cpp11/forward_list.hpp
        include/msgpack/adaptor/cpp11/reference_wrapper.hpp
        include/msgpack/adaptor/cpp11/shared_ptr.hpp
+        include/msgpack/adaptor/cpp11/timespec.hpp
        include/msgpack/adaptor/cpp11/tuple.hpp
        include/msgpack/adaptor/cpp11/unique_ptr.hpp
        include/msgpack/adaptor/cpp11/unordered_map.hpp
        include/msgpack/adaptor/cpp11/unordered_set.hpp
+        include/msgpack/adaptor/cpp17/byte.hpp
+        include/msgpack/adaptor/cpp17/carray_byte.hpp
        include/msgpack/adaptor/cpp17/optional.hpp
        include/msgpack/adaptor/cpp17/string_view.hpp
+        include/msgpack/adaptor/cpp17/vector_byte.hpp
        include/msgpack/adaptor/define.hpp
        include/msgpack/adaptor/define_decl.hpp
        include/msgpack/adaptor/deque.hpp
@@ -214,8 +232,11 @@ IF (MSGPACK_ENABLE_CXX)
        include/msgpack/adaptor/vector_bool.hpp
        include/msgpack/adaptor/vector_char.hpp
        include/msgpack/adaptor/vector_unsigned_char.hpp
+        include/msgpack/adaptor/wstring.hpp
        include/msgpack/cpp_config.hpp
        include/msgpack/cpp_config_decl.hpp
+        include/msgpack/create_object_visitor.hpp
+        include/msgpack/create_object_visitor_decl.hpp
        include/msgpack/fbuffer.hpp
        include/msgpack/fbuffer_decl.hpp
        include/msgpack/gcc_atomic.hpp
@@ -223,12 +244,16 @@ IF (MSGPACK_ENABLE_CXX)
        include/msgpack/iterator_decl.hpp
        include/msgpack/meta.hpp
        include/msgpack/meta_decl.hpp
+        include/msgpack/null_visitor.hpp
+        include/msgpack/null_visitor_decl.hpp
        include/msgpack/object.hpp
        include/msgpack/object_decl.hpp
        include/msgpack/object_fwd.hpp
        include/msgpack/object_fwd_decl.hpp
        include/msgpack/pack.hpp
        include/msgpack/pack_decl.hpp
+        include/msgpack/parse.hpp
+        include/msgpack/parse_decl.hpp
        include/msgpack/parse_return.hpp
        include/msgpack/preprocessor.hpp
        include/msgpack/preprocessor/arithmetic.hpp
@@ -433,6 +458,7 @@ IF (MSGPACK_ENABLE_CXX)
        include/msgpack/preprocessor/seq/detail/binary_transform.hpp
        include/msgpack/preprocessor/seq/detail/is_empty.hpp
        include/msgpack/preprocessor/seq/detail/split.hpp
+        include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp
        include/msgpack/preprocessor/seq/elem.hpp
        include/msgpack/preprocessor/seq/enum.hpp
        include/msgpack/preprocessor/seq/filter.hpp
@@ -523,15 +549,20 @@ IF (MSGPACK_ENABLE_CXX)
        include/msgpack/v1/adaptor/cpp11/array.hpp
        include/msgpack/v1/adaptor/cpp11/array_char.hpp
        include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp
+        include/msgpack/v1/adaptor/cpp11/chrono.hpp
        include/msgpack/v1/adaptor/cpp11/forward_list.hpp
        include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp
        include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp
+        include/msgpack/v1/adaptor/cpp11/timespec.hpp
        include/msgpack/v1/adaptor/cpp11/tuple.hpp
        include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp
        include/msgpack/v1/adaptor/cpp11/unordered_map.hpp
        include/msgpack/v1/adaptor/cpp11/unordered_set.hpp
+        include/msgpack/v1/adaptor/cpp17/byte.hpp
+        include/msgpack/v1/adaptor/cpp17/carray_byte.hpp
        include/msgpack/v1/adaptor/cpp17/optional.hpp
        include/msgpack/v1/adaptor/cpp17/string_view.hpp
+        include/msgpack/v1/adaptor/cpp17/vector_byte.hpp
        include/msgpack/v1/adaptor/define.hpp
        include/msgpack/v1/adaptor/define_decl.hpp
        include/msgpack/v1/adaptor/deque.hpp
@@ -541,6 +572,7 @@ IF (MSGPACK_ENABLE_CXX)
        include/msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp
        include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp
        include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
+        include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp
        include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp
        include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp
        include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp
@@ -576,6 +608,7 @@ IF (MSGPACK_ENABLE_CXX)
        include/msgpack/v1/adaptor/vector_bool.hpp
        include/msgpack/v1/adaptor/vector_char.hpp
        include/msgpack/v1/adaptor/vector_unsigned_char.hpp
+        include/msgpack/v1/adaptor/wstring.hpp
        include/msgpack/v1/cpp_config.hpp
        include/msgpack/v1/cpp_config_decl.hpp
        include/msgpack/v1/detail/cpp03_zone.hpp
@@ -632,31 +665,85 @@ IF (MSGPACK_ENABLE_CXX)
        include/msgpack/v2/adaptor/v4raw_decl.hpp
        include/msgpack/v2/cpp_config_decl.hpp
        include/msgpack/v2/create_object_visitor.hpp
+        include/msgpack/v2/create_object_visitor_decl.hpp
        include/msgpack/v2/detail/cpp03_zone_decl.hpp
        include/msgpack/v2/detail/cpp11_zone_decl.hpp
        include/msgpack/v2/fbuffer_decl.hpp
        include/msgpack/v2/iterator_decl.hpp
        include/msgpack/v2/meta_decl.hpp
        include/msgpack/v2/null_visitor.hpp
+        include/msgpack/v2/null_visitor_decl.hpp
        include/msgpack/v2/object.hpp
        include/msgpack/v2/object_decl.hpp
        include/msgpack/v2/object_fwd.hpp
        include/msgpack/v2/object_fwd_decl.hpp
        include/msgpack/v2/pack_decl.hpp
        include/msgpack/v2/parse.hpp
+        include/msgpack/v2/parse_decl.hpp
        include/msgpack/v2/parse_return.hpp
        include/msgpack/v2/sbuffer_decl.hpp
        include/msgpack/v2/unpack.hpp
        include/msgpack/v2/unpack_decl.hpp
        include/msgpack/v2/vrefbuffer_decl.hpp
        include/msgpack/v2/x3_parse.hpp
+        include/msgpack/v2/x3_parse_decl.hpp
        include/msgpack/v2/x3_unpack.hpp
+        include/msgpack/v2/x3_unpack_decl.hpp
        include/msgpack/v2/zbuffer_decl.hpp
        include/msgpack/v2/zone_decl.hpp
+        include/msgpack/v3/adaptor/adaptor_base.hpp
+        include/msgpack/v3/adaptor/adaptor_base_decl.hpp
+        include/msgpack/v3/adaptor/array_ref_decl.hpp
+        include/msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp
+        include/msgpack/v3/adaptor/check_container_size_decl.hpp
+        include/msgpack/v3/adaptor/define_decl.hpp
+        include/msgpack/v3/adaptor/detail/cpp03_define_array_decl.hpp
+        include/msgpack/v3/adaptor/detail/cpp03_define_map_decl.hpp
+        include/msgpack/v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
+        include/msgpack/v3/adaptor/detail/cpp11_define_array_decl.hpp
+        include/msgpack/v3/adaptor/detail/cpp11_define_map_decl.hpp
+        include/msgpack/v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
+        include/msgpack/v3/adaptor/ext_decl.hpp
+        include/msgpack/v3/adaptor/fixint_decl.hpp
+        include/msgpack/v3/adaptor/int_decl.hpp
+        include/msgpack/v3/adaptor/map_decl.hpp
+        include/msgpack/v3/adaptor/msgpack_tuple_decl.hpp
+        include/msgpack/v3/adaptor/nil_decl.hpp
+        include/msgpack/v3/adaptor/raw_decl.hpp
+        include/msgpack/v3/adaptor/size_equal_only_decl.hpp
+        include/msgpack/v3/adaptor/v4raw_decl.hpp
+        include/msgpack/v3/cpp_config_decl.hpp
+        include/msgpack/v3/create_object_visitor_decl.hpp
+        include/msgpack/v3/detail/cpp03_zone_decl.hpp
+        include/msgpack/v3/detail/cpp11_zone_decl.hpp
+        include/msgpack/v3/fbuffer_decl.hpp
+        include/msgpack/v3/iterator_decl.hpp
+        include/msgpack/v3/meta_decl.hpp
+        include/msgpack/v3/null_visitor_decl.hpp
+        include/msgpack/v3/object_decl.hpp
+        include/msgpack/v3/object_fwd.hpp
+        include/msgpack/v3/object_fwd_decl.hpp
+        include/msgpack/v3/pack_decl.hpp
+        include/msgpack/v3/parse.hpp
+        include/msgpack/v3/parse_decl.hpp
+        include/msgpack/v3/parse_return.hpp
+        include/msgpack/v3/sbuffer_decl.hpp
+        include/msgpack/v3/unpack.hpp
+        include/msgpack/v3/unpack_decl.hpp
+        include/msgpack/v3/vrefbuffer_decl.hpp
+        include/msgpack/v3/x3_parse_decl.hpp
+        include/msgpack/v3/x3_unpack.hpp
+        include/msgpack/v3/x3_unpack_decl.hpp
+        include/msgpack/v3/zbuffer_decl.hpp
+        include/msgpack/v3/zone_decl.hpp
        include/msgpack/version.hpp
        include/msgpack/versioning.hpp
        include/msgpack/vrefbuffer.hpp
        include/msgpack/vrefbuffer_decl.hpp
+        include/msgpack/x3_parse.hpp
+        include/msgpack/x3_parse_decl.hpp
+        include/msgpack/x3_unpack.hpp
+        include/msgpack/x3_unpack_decl.hpp
        include/msgpack/zbuffer.hpp
        include/msgpack/zbuffer_decl.hpp
        include/msgpack/zone.hpp
--- a/QUICKSTART-C.md
+++ b/QUICKSTART-C.md
@@ -20,7 +20,7 @@ You might need to run `sudo port selfupdate` before installing to update the pac
 You can also install via Homebrew.

 ```
-$ sudo brew install msgpack
+$ brew install msgpack
 ```

 ## FreeBSD with Ports Collection
@@ -96,7 +96,7 @@ int main(void) {
        /* deserializes it. */
        msgpack_unpacked msg;
        msgpack_unpacked_init(&msg);
-        bool success = msgpack_unpack_next(&msg, buffer->data, buffer->size, NULL);
+        msgpack_unpack_return ret = msgpack_unpack_next(&msg, buffer->data, buffer->size, NULL);

        /* prints the deserialized object. */
        msgpack_object obj = msg.data;
@@ -137,7 +137,7 @@ int main(void) {
           /* deserializes it. */
           msgpack_unpacked msg;
           msgpack_unpacked_init(&msg);
-           bool success = msgpack_unpack_next(&msg, buffer->data, buffer->size, NULL);
+           msgpack_unpack_return ret = msgpack_unpack_next(&msg, buffer->data, buffer->size, NULL);

           /* prints the deserialized object. */
           msgpack_object obj = msg.data;
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 `msgpack` for C/C++
 ===================

-Version 2.1.3 [![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 3.2.0 [![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.
+It's like JSON but smaller and faster.

 Overview
 --------
@@ -11,7 +11,7 @@ Overview
 [MessagePack](http://msgpack.org/) is an efficient binary serialization
 format, which lets you exchange data among multiple languages like JSON,
 except that it's faster and smaller. Small integers are encoded into a
-single byte while typical short strings require only one extra byte in
+single byte and short strings require only one extra byte in
 addition to the strings themselves.

 Example
@@ -97,6 +97,10 @@ int main(void)
    msgpack::type::tuple<int, bool, std::string> dst;
    deserialized.convert(dst);

+    // or create the new instance
+    msgpack::type::tuple<int, bool, std::string> dst2 =
+        deserialized.as<msgpack::type::tuple<int, bool, std::string> >();
+
    return 0;
 }
 ```
@@ -108,7 +112,7 @@ Usage

 ### C++ Header Only Library

-When you use msgpack on C++03 and C++11, you can just add
+When you use msgpack on C++, you can just add
 msgpack-c/include to your include path:

    g++ -I msgpack-c/include your_source_file.cpp
@@ -135,14 +139,18 @@ C and C++03:
    $ make
    $ sudo make install

-If you want to setup C++11 version of msgpack instead,
+If you want to setup C++11 or C++17 version of msgpack instead,
 execute the following commands:

    $ git clone https://github.com/msgpack/msgpack-c.git
    $ cd msgpack-c
-    $ cmake -DMSGPACK_CXX11=ON .
+    $ cmake -DMSGPACK_CXX[11|17]=ON .
    $ sudo make install

+`MSGPACK_CXX[11|17]` flags are not affected to installing files. Just switching test cases. All files are installed in every settings.
+
+When you use the C part of `msgpack-c`, you need to build and link the library. By default, both static/shared libraries are built. If you want to build only static library, set `BUILD_SHARED_LIBS=OFF` to cmake. If you want to build only shared library, set `BUILD_SHARED_L
+
 #### GUI on Windows

 Clone msgpack-c git repository.
@@ -170,7 +178,7 @@ the binaries:' text box.

 ### Documentation

-You can get addtional information on the
+You can get additional information including the tutorial on the
 [wiki](https://github.com/msgpack/msgpack-c/wiki).

 Contributing
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,10 +1,10 @@
-version: 2.1.3.{build}
+version: 3.2.0.{build}

 image:
 - Visual Studio 2015
 environment:
  global:
-    BOOST_ROOT: C:\Libraries\boost_1_60_0
+    BOOST_ROOT: C:\Libraries\boost_1_67_0
  matrix:
    - cpp11: -DMSGPACK_CXX11=OFF
      boost: -DMSGPACK_BOOST=OFF
--- a/ci/build_cmake.sh
+++ b/ci/build_cmake.sh
@@ -23,7 +23,7 @@ else
    export BIT32="OFF"
 fi

-cmake -DMSGPACK_CXX11=${CXX11} -DMSGPACK_32BIT=${BIT32} -DMSGPACK_BOOST=${BOOST} -DMSGPACK_ENABLE_SHARED=${SHARED} -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DMSGPACK_DEFAULT_API_VERSION=${API_VERSION} -DMSGPACK_USE_X3_PARSE=${X3_PARSE} ..
+cmake -DMSGPACK_CXX11=${CXX11} -DMSGPACK_CXX17=${CXX17} -DMSGPACK_32BIT=${BIT32} -DMSGPACK_BOOST=${BOOST} -DBUILD_SHARED_LIBS=${SHARED} -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DMSGPACK_DEFAULT_API_VERSION=${API_VERSION} -DMSGPACK_USE_X3_PARSE=${X3_PARSE} ..

 ret=$?
 if [ $ret -ne 0 ]
@@ -39,7 +39,7 @@ then
    exit $ret
 fi

-make test
+ctest -VV

 ret=$?
 if [ $ret -ne 0 ]
--- a/ci/build_regression.sh
+++ b/ci/build_regression.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+mkdir -p build
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+cd build
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+if [ "${ARCH}" == "32" ]
+then
+    echo "64 bit support required for regressions"
+    exit 1
+fi
+
+cmake -DMSGPACK_FUZZ_REGRESSION="ON" -DMSGPACK_CXX11="ON" -DMSGPACK_BOOST=${BOOST} -DMSGPACK_SAN=${MSGPACK_SAN} -v ..
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make test
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+exit 0
--- a/erb/v1/cpp03_define_array.hpp.erb
+++ b/erb/v1/cpp03_define_array.hpp.erb
@@ -75,7 +75,7 @@ struct define_array<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
    void msgpack_object(msgpack::object* o, msgpack::zone& z) const
    {
        o->type = msgpack::type::ARRAY;
-        o->via.array.ptr = static_cast<msgpack::object*>(z.allocate_align(sizeof(msgpack::object)*<%=i+1%>));
+        o->via.array.ptr = static_cast<msgpack::object*>(z.allocate_align(sizeof(msgpack::object)*<%=i+1%>, MSGPACK_ZONE_ALIGNOF(msgpack::object)));
        o->via.array.size = <%=i+1%>;
        <%0.upto(i) {|j|%>
        o->via.array.ptr[<%=j%>] = msgpack::object(a<%=j%>, z);<%}%>
--- a/erb/v1/cpp03_define_map.hpp.erb
+++ b/erb/v1/cpp03_define_map.hpp.erb
@@ -61,6 +61,7 @@ struct define_map<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
        if(o.type != msgpack::type::MAP) { throw msgpack::type_error(); }
        std::map<std::string, msgpack::object const*> kvmap;
        for (uint32_t i = 0; i < o.via.map.size; ++i) {
+            if (o.via.map.ptr[i].key.type != msgpack::type::STR) { throw msgpack::type_error(); }
            kvmap.insert(
                std::map<std::string, msgpack::object const*>::value_type(
                    std::string(
@@ -82,7 +83,7 @@ struct define_map<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
    void msgpack_object(msgpack::object* o, msgpack::zone& z) const
    {
        o->type = msgpack::type::MAP;
-        o->via.map.ptr = static_cast<msgpack::object_kv*>(z.allocate_align(sizeof(msgpack::object_kv)*<%=(i+1)/2%>));
+        o->via.map.ptr = static_cast<msgpack::object_kv*>(z.allocate_align(sizeof(msgpack::object_kv)*<%=(i+1)/2%>, MSGPACK_ZONE_ALIGNOF(msgpack::object_kv)));
        o->via.map.size = <%=(i+1)/2%>;
        <%0.step(i,2) {|j|%>
        o->via.map.ptr[<%=j/2%>].key = msgpack::object(a<%=j%>, z);
--- a/erb/v1/cpp03_msgpack_tuple.hpp.erb
+++ b/erb/v1/cpp03_msgpack_tuple.hpp.erb
@@ -121,7 +121,7 @@ inline tuple<> make_tuple()
 /// @cond
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-inline tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(typename tuple_type<A0>::transparent_reference a0<%1.upto(i) {|j|%>, typename tuple_type<A<%=j%>>::transparent_reference a<%=j%><%}%>)
+tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(A0 const& a0<%1.upto(i) {|j|%>, A<%=j%> const& a<%=j%><%}%>)
 {
    return tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>(a0<%1.upto(i) {|j|%>, a<%=j%><%}%>);
 }
@@ -207,7 +207,7 @@ struct object_with_zone<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> > {
        msgpack::object::with_zone& o,
        const type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v) const {
        o.type = msgpack::type::ARRAY;
-        o.via.array.ptr = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*<%=i+1%>));
+        o.via.array.ptr = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*<%=i+1%>, MSGPACK_ZONE_ALIGNOF(msgpack::object)));
        o.via.array.size = <%=i+1%>;
        <%0.upto(i) {|j|%>
        o.via.array.ptr[<%=j%>] = msgpack::object(v.template get<<%=j%>>(), o.zone);<%}%>
--- a/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb
+++ b/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb
@@ -54,7 +54,7 @@ tuple<> make_tuple();
 /// @cond
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(typename tuple_type<A0>::transparent_reference a0<%1.upto(i) {|j|%>, typename tuple_type<A<%=j%>>::transparent_reference a<%=j%><%}%>);
+tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(A0 const& a0<%1.upto(i) {|j|%>, A<%=j%> const& a<%=j%><%}%>);
 <%}%>
 /// @endcond

--- a/erb/v1/cpp03_zone.hpp.erb
+++ b/erb/v1/cpp03_zone.hpp.erb
@@ -55,7 +55,7 @@ class zone {
            ++m_tail;
        }
        void push_expand(void (*func)(void*), void* data) {
-            const size_t nused = m_end - m_array;
+            const size_t nused = static_cast<size_t>(m_end - m_array);
            size_t nnext;
            if(nused == 0) {
                nnext = (sizeof(finalizer) < 72/2) ?
@@ -178,7 +178,9 @@ private:
    template <typename T>
    static void object_delete(void* obj);

-    void* allocate_expand(size_t size);
+    static char* get_aligned(char* ptr, size_t align);
+
+    char* allocate_expand(size_t size);
 private:
    zone(const zone&);
    zone& operator=(const zone&);
@@ -188,37 +190,42 @@ inline zone::zone(size_t chunk_size) /* throw() */ :m_chunk_size(chunk_size), m_
 {
 }

-inline void* zone::allocate_align(size_t size, size_t align)
+inline char* zone::get_aligned(char* ptr, size_t align)
 {
-    char* aligned =
+    return
        reinterpret_cast<char*>(
            reinterpret_cast<size_t>(
-                (m_chunk_list.m_ptr + (align - 1))) / align * align);
-    size_t adjusted_size = size + (aligned - m_chunk_list.m_ptr);
-    if(m_chunk_list.m_free >= adjusted_size) {
-        m_chunk_list.m_free -= adjusted_size;
-        m_chunk_list.m_ptr  += adjusted_size;
-        return aligned;
+            (ptr + (align - 1))) / align * align);
+}
+
+inline void* zone::allocate_align(size_t size, size_t align)
+{
+    char* aligned = get_aligned(m_chunk_list.m_ptr, align);
+    size_t adjusted_size = size + static_cast<size_t>(aligned - m_chunk_list.m_ptr);
+    if (m_chunk_list.m_free < adjusted_size) {
+        size_t enough_size = size + align - 1;
+        char* ptr = allocate_expand(enough_size);
+        aligned = get_aligned(ptr, align);
+        adjusted_size = size + static_cast<size_t>(aligned - m_chunk_list.m_ptr);
    }
-    return reinterpret_cast<char*>(
-        reinterpret_cast<size_t>(
-            allocate_expand(size + (align - 1))) / align * align);
+    m_chunk_list.m_free -= adjusted_size;
+    m_chunk_list.m_ptr  += adjusted_size;
+    return aligned;
 }

 inline void* zone::allocate_no_align(size_t size)
 {
-    if(m_chunk_list.m_free < size) {
-        return allocate_expand(size);
-    }
-
    char* ptr = m_chunk_list.m_ptr;
+    if(m_chunk_list.m_free < size) {
+        ptr = allocate_expand(size);
+    }
    m_chunk_list.m_free -= size;
    m_chunk_list.m_ptr  += size;

    return ptr;
 }

-inline void* zone::allocate_expand(size_t size)
+inline char* zone::allocate_expand(size_t size)
 {
    chunk_list* const cl = &m_chunk_list;

@@ -240,8 +247,8 @@ inline void* zone::allocate_expand(size_t size)

    c->m_next  = cl->m_head;
    cl->m_head = c;
-    cl->m_free = sz - size;
-    cl->m_ptr  = ptr + size;
+    cl->m_free = sz;
+    cl->m_ptr  = ptr;

    return ptr;
 }
@@ -300,7 +307,7 @@ inline std::size_t aligned_size(
 template <typename T<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
 T* zone::allocate(<%=(1..i).map{|j|"A#{j} a#{j}"}.join(', ')%>)
 {
-    void* x = allocate_align(sizeof(T));
+    void* x = allocate_align(sizeof(T), MSGPACK_ZONE_ALIGNOF(T));
    try {
        m_finalizer_array.push(&zone::object_destruct<T>, x);
    } catch (...) {
--- a/erb/v1/cpp03_zone_decl.hpp.erb
+++ b/erb/v1/cpp03_zone_decl.hpp.erb
@@ -24,6 +24,14 @@
 #define MSGPACK_ZONE_ALIGN sizeof(void*)
 #endif

+#if defined(_MSC_VER)
+#define MSGPACK_ZONE_ALIGNOF(type) __alignof(type)
+#else
+#define MSGPACK_ZONE_ALIGNOF(type) __alignof__(type)
+#endif
+// For a compiler that doesn't support __alignof__:
+// #define MSGPACK_ZONE_ALIGNOF(type) MSGPACK_ZONE_ALIGN
+
 <% GENERATION_LIMIT = 15 %>
 namespace msgpack {

--- a/example/boost/CMakeLists.txt
+++ b/example/boost/CMakeLists.txt
@@ -3,6 +3,20 @@ IF (MSGPACK_BOOST)
        msgpack_variant_capitalize.cpp
        msgpack_variant_mapbased.cpp
    )
+    IF (MSGPACK_CXX11 OR MSGPACK_CXX17)
+        FIND_PACKAGE (Threads REQUIRED)
+        LIST (APPEND exec_PROGRAMS
+            asio_send_recv.cpp
+        )
+        IF (ZLIB_FOUND)
+            INCLUDE_DIRECTORIES (
+                ${ZLIB_INCLUDE_DIRS}
+            )
+            LIST (APPEND exec_PROGRAMS
+                asio_send_recv_zlib.cpp
+            )
+        ENDIF ()
+    ENDIF ()
 ENDIF ()

 FOREACH (source_file ${exec_PROGRAMS})
@@ -15,8 +29,17 @@ FOREACH (source_file ${exec_PROGRAMS})
        PRIVATE
            $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
    )
+    TARGET_LINK_LIBRARIES (${source_file_we}
+        ${Boost_SYSTEM_LIBRARY}
+        ${CMAKE_THREAD_LIBS_INIT}
+    )
+    IF (ZLIB_FOUND)
+        TARGET_LINK_LIBRARIES (${source_file_we}
+            ${ZLIB_LIBRARIES}
+        )
+    ENDIF()
    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3")
+        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
    ENDIF ()

    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--- a/example/boost/asio_send_recv.cpp
+++ b/example/boost/asio_send_recv.cpp
@@ -0,0 +1,104 @@
+// MessagePack for C++ example
+//
+// Copyright (C) 2017 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <string>
+#include <sstream>
+#include <iostream>
+
+#include <boost/asio.hpp>
+#include <boost/lexical_cast.hpp>
+
+#include <msgpack.hpp>
+
+int main() {
+    boost::asio::io_service ios;
+    std::uint16_t const port = 12345;
+
+    // Server
+    std::size_t const window_size = 10;
+    boost::asio::ip::tcp::acceptor ac(ios, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port));
+    boost::asio::ip::tcp::socket ss(ios);
+    std::function<void()> do_accept;
+    std::function<void()> do_async_read_some;
+
+    msgpack::unpacker unp;
+
+    do_accept = [&] {
+        ac.async_accept(
+            ss,
+            [&]
+            (boost::system::error_code const& e) {
+                if (e) {
+                    std::cout << __LINE__ << ":" << e.message() << std::endl;
+                    return;
+                }
+                do_async_read_some = [&] {
+                    unp.reserve_buffer(window_size);
+                    ss.async_read_some(
+                        boost::asio::buffer(unp.buffer(), window_size),
+                        [&](boost::system::error_code const& e, std::size_t bytes_transferred) {
+                            if (e) {
+                                std::cout << __LINE__ << ":" << e.message() << std::endl;
+                                return;
+                            }
+                            std::cout << bytes_transferred << " bytes read." << std::endl;
+                            unp.buffer_consumed(bytes_transferred);
+                            msgpack::object_handle oh;
+                            while (unp.next(oh)) {
+                                std::cout << oh.get() << std::endl;
+                                // In order to finish the program,
+                                // return if one complete msgpack is processed.
+                                // In actual server, don't return here.
+                                return;
+                            }
+                            do_async_read_some();
+                        }
+                    );
+                };
+                do_async_read_some();
+            }
+        );
+    };
+    do_accept();
+
+    // Client
+    auto host = "localhost";
+    boost::asio::ip::tcp::resolver r(ios);
+
+#if BOOST_VERSION < 106600
+    boost::asio::ip::tcp::resolver::query q(host, boost::lexical_cast<std::string>(port));
+    auto it = r.resolve(q);
+    boost::asio::ip::tcp::resolver::iterator end;
+#else  // BOOST_VERSION < 106600
+    auto eps = r.resolve(host, boost::lexical_cast<std::string>(port));
+    auto it = eps.begin();
+    auto end = eps.end();
+#endif // BOOST_VERSION < 106600
+
+    boost::asio::ip::tcp::socket cs(ios);
+    boost::asio::async_connect(
+        cs,
+        it,
+        end,
+        [&]
+        (boost::system::error_code const& e, boost::asio::ip::tcp::resolver::iterator) {
+            if (e) {
+                std::cout << __LINE__ << ":" << e.message() << std::endl;
+                return;
+            }
+            std::cout << __LINE__ << ":client connected" << std::endl;
+            msgpack::sbuffer sb;
+            msgpack::pack(sb, std::make_tuple(42, false, "hello world", 12.3456));
+            write(cs, boost::asio::buffer(sb.data(), sb.size()));
+        }
+    );
+
+    // Start
+    ios.run();
+}
--- a/example/boost/asio_send_recv_zlib.cpp
+++ b/example/boost/asio_send_recv_zlib.cpp
@@ -0,0 +1,176 @@
+// MessagePack for C++ example
+//
+// Copyright (C) 2017 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <string>
+#include <sstream>
+#include <iostream>
+
+#include <boost/asio.hpp>
+#include <boost/lexical_cast.hpp>
+
+#include <msgpack.hpp>
+#include <msgpack/zbuffer.hpp>
+
+#include <zlib.h>
+
+void print(std::string const& buf) {
+    for (std::string::const_iterator it = buf.begin(), end = buf.end();
+         it != end;
+         ++it) {
+        std::cout
+            << std::setw(2)
+            << std::hex
+            << std::setfill('0')
+            << (static_cast<int>(*it) & 0xff)
+            << ' ';
+    }
+    std::cout << std::dec << std::endl;
+}
+
+int main() {
+    boost::asio::io_service ios;
+    std::uint16_t const port = 12345;
+
+    int num_of_zlib_data = 2;
+    int idx_zlib_data = 0;
+
+    // Server
+    std::size_t const window_size = 11;
+    boost::asio::ip::tcp::acceptor ac(ios, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port));
+    boost::asio::ip::tcp::socket ss(ios);
+    std::function<void()> do_accept;
+    std::function<void()> do_async_read_some;
+
+    // zlib for decompress
+    z_stream strm;
+    auto zlib_init = [&] {
+        strm.zalloc = Z_NULL;
+        strm.zfree = Z_NULL;
+        strm.opaque = Z_NULL;
+        strm.next_in = Z_NULL;
+        {
+            int zret = inflateInit(&strm);
+            if (zret != Z_OK) {
+                std::cout << "Zlib inflateInit() error = " << zret << std::endl;
+            }
+        }
+    };
+    zlib_init();
+    std::vector<char> buf(4); // buf size
+
+    msgpack::unpacker unp;
+
+    do_accept = [&] {
+        ac.async_accept(
+            ss,
+            [&]
+            (boost::system::error_code const& e) {
+                if (e) {
+                    std::cout << __LINE__ << ":" << e.message() << std::endl;
+                    return;
+                }
+                do_async_read_some = [&] {
+                    ss.async_read_some(
+                        boost::asio::buffer(buf),
+                        [&](boost::system::error_code const& e, std::size_t bytes_transferred) {
+                            if (e) {
+                                std::cout << __LINE__ << ":" << e.message() << std::endl;
+                                return;
+                            }
+                            std::cout << bytes_transferred << " bytes read." << std::endl;
+                            print(std::string(std::string(&buf[0], buf.size())));
+                            strm.avail_in = bytes_transferred;
+                            do {
+                                strm.next_in = reinterpret_cast<unsigned char*>(&buf[0]) + (bytes_transferred - strm.avail_in);
+                                int zret;
+                                unp.reserve_buffer(window_size);
+                                strm.avail_out = window_size;
+                                strm.next_out = reinterpret_cast<unsigned char*>(unp.buffer());
+                                do {
+                                    zret = inflate(&strm, Z_NO_FLUSH);
+                                    assert(zret != Z_STREAM_ERROR);
+                                    switch (zret) {
+                                    case Z_NEED_DICT:
+                                        zret = Z_DATA_ERROR;
+                                        // fall through
+                                    case Z_DATA_ERROR:
+                                    case Z_MEM_ERROR:
+                                        inflateEnd(&strm);
+                                        std::cout << "Zlib inflate() error = " << zret << std::endl;
+                                        std::exit(-1);
+                                    }
+                                    std::size_t decompressed_size = window_size - strm.avail_out;
+                                    std::cout << decompressed_size << " bytes decompressed." << std::endl;
+                                    unp.buffer_consumed(decompressed_size);
+                                    msgpack::object_handle oh;
+                                    while (unp.next(oh)) {
+                                        std::cout << oh.get() << std::endl;
+                                    }
+                                } while (strm.avail_out == 0);
+                                if (zret == Z_STREAM_END) {
+                                    inflateEnd(&strm);
+                                    std::cout << "Zlib decompress finished." << std::endl;
+                                    ++idx_zlib_data;
+                                    if (idx_zlib_data == num_of_zlib_data) {
+                                        std::cout << "All zlib decompress finished." << std::endl;
+                                        return;
+                                    }
+                                    zlib_init();
+                                }
+                            } while (strm.avail_in != 0);
+                            do_async_read_some();
+                        }
+                    );
+                };
+                do_async_read_some();
+            }
+        );
+    };
+    do_accept();
+
+    // Client
+    auto host = "localhost";
+
+    boost::asio::ip::tcp::resolver r(ios);
+
+#if BOOST_VERSION < 106600
+    boost::asio::ip::tcp::resolver::query q(host, boost::lexical_cast<std::string>(port));
+    auto it = r.resolve(q);
+    boost::asio::ip::tcp::resolver::iterator end;
+#else  // BOOST_VERSION < 106600
+    auto eps = r.resolve(host, boost::lexical_cast<std::string>(port));
+    auto it = eps.begin();
+    auto end = eps.end();
+#endif // BOOST_VERSION < 106600
+
+    boost::asio::ip::tcp::socket cs(ios);
+    boost::asio::async_connect(
+        cs,
+        it,
+        end,
+        [&]
+        (boost::system::error_code const& e, boost::asio::ip::tcp::resolver::iterator) {
+            if (e) {
+                std::cout << __LINE__ << ":" << e.message() << std::endl;
+                return;
+            }
+            std::cout << __LINE__ << ":client connected" << std::endl;
+            for (int i = 0; i != num_of_zlib_data; ++i) {
+                msgpack::zbuffer zb;
+                msgpack::pack(zb, std::make_tuple(i, false, "hello world", 12.3456));
+                zb.flush(); // finalize zbuffer (don't forget it)
+                print(std::string(zb.data(), zb.size()));
+                write(cs, boost::asio::buffer(zb.data(), zb.size()));
+            }
+        }
+    );
+
+    // Start
+    ios.run();
+}
--- a/example/c/CMakeLists.txt
+++ b/example/c/CMakeLists.txt
@@ -1,6 +1,8 @@
 IF (MSGPACK_ENABLE_SHARED)
    SET (MSGPACK_LIB msgpackc)
-ELSE ()
+ENDIF ()
+
+IF (MSGPACK_ENABLE_STATIC)
    SET (MSGPACK_LIB msgpackc-static)
 ENDIF ()

@@ -23,7 +25,7 @@ FOREACH (source_file ${exec_PROGRAMS})
        ${MSGPACK_LIB}
    )
    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3")
+        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
    ENDIF ()

    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--- a/example/c/speed_test_uint32_array.c
+++ b/example/c/speed_test_uint32_array.c
@@ -22,7 +22,7 @@ void test()

    msgpack_unpacked_init(&msg);

-    while (msgpack_unpack_next(&msg, buf.data, buf.size, &upk_pos)) {
+    while (msgpack_unpack_next(&msg, buf.data, buf.size, &upk_pos) == MSGPACK_UNPACK_SUCCESS) {
    }

    msgpack_sbuffer_destroy(&buf);
--- a/example/c/speed_test_uint64_array.c
+++ b/example/c/speed_test_uint64_array.c
@@ -23,7 +23,7 @@ void test()

    msgpack_unpacked_init(&msg);

-    while (msgpack_unpack_next(&msg, buf.data, buf.size, &upk_pos)) {
+    while (msgpack_unpack_next(&msg, buf.data, buf.size, &upk_pos) == MSGPACK_UNPACK_SUCCESS) {
    }

    msgpack_sbuffer_destroy(&buf);
--- a/example/cpp03/CMakeLists.txt
+++ b/example/cpp03/CMakeLists.txt
@@ -40,7 +40,7 @@ FOREACH (source_file ${exec_PROGRAMS})
            $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
    )
    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3")
+        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
    ENDIF ()
    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
        IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
@@ -65,7 +65,7 @@ FOREACH (source_file ${with_pthread_PROGRAMS})
        ${CMAKE_THREAD_LIBS_INIT}
    )
    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3")
+        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
    ENDIF ()
    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
        IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
--- a/example/cpp03/class_non_intrusive.cpp
+++ b/example/cpp03/class_non_intrusive.cpp
@@ -69,7 +69,7 @@ struct object_with_zone<my_class> {
        o.type = type::ARRAY;
        o.via.array.size = 2;
        o.via.array.ptr = static_cast<msgpack::object*>(
-            o.zone.allocate_align(sizeof(msgpack::object) * o.via.array.size));
+            o.zone.allocate_align(sizeof(msgpack::object) * o.via.array.size, MSGPACK_ZONE_ALIGNOF(msgpack::object)));
        o.via.array.ptr[0] = msgpack::object(v.get_name(), o.zone);
        o.via.array.ptr[1] = msgpack::object(v.get_age(), o.zone);
    }
--- a/example/cpp11/CMakeLists.txt
+++ b/example/cpp11/CMakeLists.txt
@@ -25,7 +25,7 @@ IF (MSGPACK_CXX11)
                $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
        )
        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ")
+            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
        ENDIF ()

        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--- a/example/x3/CMakeLists.txt
+++ b/example/x3/CMakeLists.txt
@@ -1,4 +1,4 @@
-IF (MSGPACK_USE_X3_PARSE)
+IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1)
    INCLUDE_DIRECTORIES (
        ../include
    )
@@ -23,7 +23,7 @@ IF (MSGPACK_USE_X3_PARSE)
                $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
        )
        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g ")
+            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
        ENDIF ()

        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
@@ -54,7 +54,7 @@ IF (MSGPACK_USE_X3_PARSE)
            ${CMAKE_THREAD_LIBS_INIT}
        )
        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g ")
+            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
        ENDIF ()

        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--- a/example/x3/parse.cpp
+++ b/example/x3/parse.cpp
@@ -40,7 +40,13 @@ struct json_like_visitor : msgpack::v2::null_visitor {
        m_s += ss.str();
        return true;
    }
-    bool visit_float(double v) {
+    bool visit_float32(float v) {
+        std::stringstream ss;
+        ss << v;
+        m_s += ss.str();
+        return true;
+    }
+    bool visit_float64(double v) {
        std::stringstream ss;
        ss << v;
        m_s += ss.str();
--- a/external/boost/predef
+++ b/external/boost/predef
--- a/external/boost/preprocessor
+++ b/external/boost/preprocessor
--- a/fuzz/CMakeLists.txt
+++ b/fuzz/CMakeLists.txt
@@ -0,0 +1,43 @@
+FIND_PACKAGE (GTest REQUIRED)
+FIND_PACKAGE (ZLIB REQUIRED)
+FIND_PACKAGE (Boost REQUIRED COMPONENTS system filesystem)
+
+INCLUDE_DIRECTORIES (
+  ${GTEST_INCLUDE_DIRS}
+  ${ZLIB_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
+)
+
+LIST (APPEND check_PROGRAMS
+    regression_runner.cpp
+)
+
+LINK_DIRECTORIES (
+  ${Boost_LIBRARY_DIRS}
+)
+
+FOREACH (source_file ${check_PROGRAMS})
+    GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
+    ADD_EXECUTABLE (
+        ${source_file_we}
+        ${source_file}
+    )
+    TARGET_LINK_LIBRARIES (${source_file_we}
+        msgpackc
+        ${GTEST_BOTH_LIBRARIES}
+        ${ZLIB_LIBRARIES}
+        ${CMAKE_THREAD_LIBS_INIT}
+        ${Boost_LIBRARIES}
+    )
+    ADD_TEST (${source_file_we} ${source_file_we})
+    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+      SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -g")
+        IF ("${MSGPACK_SAN}" STREQUAL "ASAN")
+            SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-omit-frame-pointer -fsanitize=address")
+            SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=address")
+        ELSEIF ("${MSGPACK_SAN}" STREQUAL "UBSAN")
+            SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined")
+            SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
+        ENDIF()
+    ENDIF()
+ENDFOREACH ()
--- a/fuzz/regression_runner.cpp
+++ b/fuzz/regression_runner.cpp
@@ -0,0 +1,50 @@
+#include <boost/filesystem.hpp>
+#include <gtest/gtest.h>
+
+#include <fstream>
+#include <iostream>
+#include <vector>
+
+#include "unpack_pack_fuzzer.cpp"
+
+using ::testing::TestWithParam;
+using ::testing::ValuesIn;
+
+
+std::vector<std::string> ListDirectory(const std::string& path) {
+  std::vector<std::string> v;
+
+  boost::filesystem::path p(path);
+  boost::filesystem::directory_iterator f{p};
+
+  if(boost::filesystem::is_directory(p)) {
+    while (f != boost::filesystem::directory_iterator{}) {
+      v.push_back((*f++).path().string());
+    }
+  }
+  return v;
+}
+
+class UnpackPackFuzzerRegressionTest : public ::testing::TestWithParam<std::string> {
+public:
+};
+
+TEST_P(UnpackPackFuzzerRegressionTest, Returns0) {
+  auto fpath = GetParam();
+  std::ifstream in(fpath, std::ifstream::binary);
+  if (!in) {
+    FAIL() << fpath << " not found";
+  }
+  in.seekg(0, in.end);
+  size_t length = in.tellg();
+  in.seekg(0, in.beg);
+  std::vector<char> bytes(length);
+  in.read(bytes.data(), bytes.size());
+  assert(in);
+  EXPECT_EQ(0, LLVMFuzzerTestOneInput(reinterpret_cast<const uint8_t *>(bytes.data()),
+                                      bytes.size()));
+}
+
+INSTANTIATE_TEST_CASE_P(UnpackPackFuzzerRegressions,
+                        UnpackPackFuzzerRegressionTest,
+                        ::testing::ValuesIn(ListDirectory("../../fuzz/unpack_pack_fuzzer_regressions")));
--- a/fuzz/unpack_pack_fuzzer.cpp
+++ b/fuzz/unpack_pack_fuzzer.cpp
@@ -0,0 +1,23 @@
+#include <msgpack.hpp>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+  try {
+    // NOTE(derwolfe): by default the limits are set at 2^32-1 length. I'm
+    // setting these at far smaller values to avoid OOMs
+    const int test_limit = 1000;
+    msgpack::object_handle unpacked = msgpack::unpack(reinterpret_cast<const char *>(data),
+                                                      size,
+                                                      nullptr,
+                                                      nullptr,
+                                                      msgpack::unpack_limit(test_limit,
+                                                                            test_limit,
+                                                                            test_limit,
+                                                                            test_limit,
+                                                                            test_limit,
+                                                                            test_limit));
+    msgpack::sbuffer sbuf;
+    msgpack::pack(sbuf, unpacked.get());
+  } catch (...) {
+  }
+  return 0;
+}
--- a/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608
+++ b/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608
--- a/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464
+++ b/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464
--- a/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray
+++ b/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray
@@ -0,0 +1 @@
+<EFBFBD>
--- a/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject
+++ b/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject
@@ -0,0 +1 @@
+<EFBFBD>
--- a/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting
+++ b/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting
@@ -0,0 +1,2 @@
+<EFBFBD><01><02><03><04><05><06><07><08>	<09>
+<EFBFBD><0B><0C>
--- a/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap
+++ b/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap
--- a/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground
+++ b/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground
--- a/include/msgpack.hpp
+++ b/include/msgpack.hpp
@@ -11,7 +11,11 @@
 #include "msgpack/iterator.hpp"
 #include "msgpack/zone.hpp"
 #include "msgpack/pack.hpp"
+#include "msgpack/null_visitor.hpp"
+#include "msgpack/parse.hpp"
 #include "msgpack/unpack.hpp"
+#include "msgpack/x3_parse.hpp"
+#include "msgpack/x3_unpack.hpp"
 #include "msgpack/sbuffer.hpp"
 #include "msgpack/vrefbuffer.hpp"
 #include "msgpack/version.hpp"
--- a/include/msgpack/adaptor/adaptor_base.hpp
+++ b/include/msgpack/adaptor/adaptor_base.hpp
@@ -14,5 +14,6 @@

 #include "msgpack/v1/adaptor/adaptor_base.hpp"
 #include "msgpack/v2/adaptor/adaptor_base.hpp"
+#include "msgpack/v3/adaptor/adaptor_base.hpp"

 #endif // MSGPACK_ADAPTOR_BASE_HPP
--- a/include/msgpack/adaptor/adaptor_base_decl.hpp
+++ b/include/msgpack/adaptor/adaptor_base_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/adaptor_base_decl.hpp"
 #include "msgpack/v2/adaptor/adaptor_base_decl.hpp"
+#include "msgpack/v3/adaptor/adaptor_base_decl.hpp"

 #endif // MSGPACK_ADAPTOR_BASE_DECL_HPP
--- a/include/msgpack/adaptor/array_ref_decl.hpp
+++ b/include/msgpack/adaptor/array_ref_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/array_ref_decl.hpp"
 #include "msgpack/v2/adaptor/array_ref_decl.hpp"
+#include "msgpack/v3/adaptor/array_ref_decl.hpp"

 #endif // MSGPACK_TYPE_ARRAY_REF_DECL_HPP
--- a/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp
+++ b/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp"
 #include "msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp"
+#include "msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp"

 #endif // MSGPACK_TYPE_BOOST_MSGPACK_VARIANT_DECL_HPP
--- a/include/msgpack/adaptor/check_container_size_decl.hpp
+++ b/include/msgpack/adaptor/check_container_size_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/check_container_size_decl.hpp"
 #include "msgpack/v2/adaptor/check_container_size_decl.hpp"
+#include "msgpack/v3/adaptor/check_container_size_decl.hpp"

 #endif // MSGPACK_CHECK_CONTAINER_SIZE_DECL_HPP
--- a/include/msgpack/adaptor/cpp11/chrono.hpp
+++ b/include/msgpack/adaptor/cpp11/chrono.hpp
@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2017 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef MSGPACK_TYPE_CPP11_CHRONO_HPP
+#define MSGPACK_TYPE_CPP11_CHRONO_HPP
+
+#include "msgpack/v1/adaptor/cpp11/chrono.hpp"
+
+#endif // MSGPACK_TYPE_CPP11_CHRONO_HPP
--- a/include/msgpack/adaptor/cpp11/timespec.hpp
+++ b/include/msgpack/adaptor/cpp11/timespec.hpp
@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2019 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef MSGPACK_TYPE_CPP11_TIMESPEC_HPP
+#define MSGPACK_TYPE_CPP11_TIMESPEC_HPP
+
+#include "msgpack/v1/adaptor/cpp11/timespec.hpp"
+
+#endif // MSGPACK_TYPE_CPP11_TIMESPEC_HPP
--- a/include/msgpack/adaptor/cpp17/byte.hpp
+++ b/include/msgpack/adaptor/cpp17/byte.hpp
@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef MSGPACK_TYPE_CPP17_BYTE_HPP
+#define MSGPACK_TYPE_CPP17_BYTE_HPP
+
+#include "msgpack/v1/adaptor/cpp17/byte.hpp"
+
+#endif // MSGPACK_TYPE_CPP17_BYTE_HPP
--- a/include/msgpack/adaptor/cpp17/carray_byte.hpp
+++ b/include/msgpack/adaptor/cpp17/carray_byte.hpp
@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef MSGPACK_TYPE_CPP17_CARRAY_BYTE_HPP
+#define MSGPACK_TYPE_CPP17_CARRAY_BYTE_HPP
+
+#include "msgpack/v1/adaptor/cpp17/carray_byte.hpp"
+
+#endif // MSGPACK_TYPE_CPP17_CARRAY_BYTE_HPP
--- a/include/msgpack/adaptor/cpp17/vector_byte.hpp
+++ b/include/msgpack/adaptor/cpp17/vector_byte.hpp
@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef MSGPACK_TYPE_CPP17_VECTOR_BYTE_HPP
+#define MSGPACK_TYPE_CPP17_VECTOR_BYTE_HPP
+
+#include "msgpack/v1/adaptor/cpp17/vector_byte.hpp"
+
+#endif // MSGPACK_TYPE_CPP17_VECTOR_BYTE_HPP
--- a/include/msgpack/adaptor/define_decl.hpp
+++ b/include/msgpack/adaptor/define_decl.hpp
@@ -27,18 +27,18 @@

 #define MSGPACK_DEFINE_ARRAY(...) \
    template <typename Packer> \
-    void msgpack_pack(Packer& pk) const \
+    void msgpack_pack(Packer& msgpack_pk) const \
    { \
-        msgpack::type::make_define_array(__VA_ARGS__).msgpack_pack(pk); \
+        msgpack::type::make_define_array(__VA_ARGS__).msgpack_pack(msgpack_pk); \
    } \
-    void msgpack_unpack(msgpack::object const& o) \
+    void msgpack_unpack(msgpack::object const& msgpack_o) \
    { \
-        msgpack::type::make_define_array(__VA_ARGS__).msgpack_unpack(o); \
+        msgpack::type::make_define_array(__VA_ARGS__).msgpack_unpack(msgpack_o); \
    }\
    template <typename MSGPACK_OBJECT> \
-    void msgpack_object(MSGPACK_OBJECT* o, msgpack::zone& z) const \
+    void msgpack_object(MSGPACK_OBJECT* msgpack_o, msgpack::zone& msgpack_z) const \
    { \
-        msgpack::type::make_define_array(__VA_ARGS__).msgpack_object(o, z); \
+        msgpack::type::make_define_array(__VA_ARGS__).msgpack_object(msgpack_o, msgpack_z); \
    }

 #define MSGPACK_BASE_ARRAY(base) (*const_cast<base *>(static_cast<base const*>(this)))
@@ -62,24 +62,24 @@

 #define MSGPACK_DEFINE_MAP(...) \
    template <typename Packer> \
-    void msgpack_pack(Packer& pk) const \
+    void msgpack_pack(Packer& msgpack_pk) const \
    { \
        msgpack::type::make_define_map \
            MSGPACK_DEFINE_MAP_IMPL(__VA_ARGS__) \
-            .msgpack_pack(pk); \
+            .msgpack_pack(msgpack_pk); \
    } \
-    void msgpack_unpack(msgpack::object const& o) \
+    void msgpack_unpack(msgpack::object const& msgpack_o) \
    { \
        msgpack::type::make_define_map \
            MSGPACK_DEFINE_MAP_IMPL(__VA_ARGS__) \
-            .msgpack_unpack(o); \
+            .msgpack_unpack(msgpack_o); \
    }\
    template <typename MSGPACK_OBJECT> \
-    void msgpack_object(MSGPACK_OBJECT* o, msgpack::zone& z) const \
+    void msgpack_object(MSGPACK_OBJECT* msgpack_o, msgpack::zone& msgpack_z) const \
    { \
        msgpack::type::make_define_map \
            MSGPACK_DEFINE_MAP_IMPL(__VA_ARGS__) \
-            .msgpack_object(o, z); \
+            .msgpack_object(msgpack_o, msgpack_z); \
    }

 #define MSGPACK_BASE_MAP(base) \
@@ -94,32 +94,32 @@
  namespace adaptor { \
    template<> \
    struct convert<enum_name> { \
-      msgpack::object const& operator()(msgpack::object const& o, enum_name& v) const { \
+      msgpack::object const& operator()(msgpack::object const& msgpack_o, enum_name& msgpack_v) const { \
        msgpack::underlying_type<enum_name>::type tmp; \
-        msgpack::operator>>(o, tmp);                   \
-        v = static_cast<enum_name>(tmp);   \
-        return o; \
+        msgpack::operator>>(msgpack_o, tmp);                   \
+        msgpack_v = static_cast<enum_name>(tmp);   \
+        return msgpack_o; \
      } \
    }; \
    template<> \
    struct object<enum_name> { \
-      void operator()(msgpack::object& o, const enum_name& v) const { \
-        msgpack::underlying_type<enum_name>::type tmp = static_cast<msgpack::underlying_type<enum_name>::type>(v); \
-        msgpack::operator<<(o, tmp);                                    \
+      void operator()(msgpack::object& msgpack_o, const enum_name& msgpack_v) const { \
+        msgpack::underlying_type<enum_name>::type tmp = static_cast<msgpack::underlying_type<enum_name>::type>(msgpack_v); \
+        msgpack::operator<<(msgpack_o, tmp);                                    \
      } \
    }; \
    template<> \
    struct object_with_zone<enum_name> { \
-      void operator()(msgpack::object::with_zone& o, const enum_name& v) const {  \
-        msgpack::underlying_type<enum_name>::type tmp = static_cast<msgpack::underlying_type<enum_name>::type>(v); \
-        msgpack::operator<<(o, tmp);                                    \
+      void operator()(msgpack::object::with_zone& msgpack_o, const enum_name& msgpack_v) const {  \
+        msgpack::underlying_type<enum_name>::type tmp = static_cast<msgpack::underlying_type<enum_name>::type>(msgpack_v); \
+        msgpack::operator<<(msgpack_o, tmp);                                    \
      } \
    }; \
    template <> \
    struct pack<enum_name> { \
      template <typename Stream> \
-      msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const enum_name& v) const { \
-          return msgpack::operator<<(o, static_cast<msgpack::underlying_type<enum_name>::type>(v)); \
+      msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& msgpack_o, const enum_name& msgpack_v) const { \
+          return msgpack::operator<<(msgpack_o, static_cast<msgpack::underlying_type<enum_name>::type>(msgpack_v)); \
      } \
    }; \
  } \
@@ -139,5 +139,6 @@

 #include "msgpack/v1/adaptor/define_decl.hpp"
 #include "msgpack/v2/adaptor/define_decl.hpp"
+#include "msgpack/v3/adaptor/define_decl.hpp"

 #endif // MSGPACK_DEFINE_DECL_HPP
--- a/include/msgpack/adaptor/ext_decl.hpp
+++ b/include/msgpack/adaptor/ext_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/ext_decl.hpp"
 #include "msgpack/v2/adaptor/ext_decl.hpp"
+#include "msgpack/v3/adaptor/ext_decl.hpp"

 #endif // MSGPACK_TYPE_EXT_DECL_HPP
--- a/include/msgpack/adaptor/fixint_decl.hpp
+++ b/include/msgpack/adaptor/fixint_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/fixint_decl.hpp"
 #include "msgpack/v2/adaptor/fixint_decl.hpp"
+#include "msgpack/v3/adaptor/fixint_decl.hpp"

 #endif // MSGPACK_TYPE_FIXINT_DECL_HPP
--- a/include/msgpack/adaptor/int_decl.hpp
+++ b/include/msgpack/adaptor/int_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/int_decl.hpp"
 #include "msgpack/v2/adaptor/int_decl.hpp"
+#include "msgpack/v3/adaptor/int_decl.hpp"

 #endif // MSGPACK_TYPE_INT_DECL_HPP
--- a/include/msgpack/adaptor/map_decl.hpp
+++ b/include/msgpack/adaptor/map_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/map_decl.hpp"
 #include "msgpack/v2/adaptor/map_decl.hpp"
+#include "msgpack/v3/adaptor/map_decl.hpp"

 #endif // MSGPACK_TYPE_MAP_DECL_HPP
--- a/include/msgpack/adaptor/msgpack_tuple_decl.hpp
+++ b/include/msgpack/adaptor/msgpack_tuple_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/msgpack_tuple_decl.hpp"
 #include "msgpack/v2/adaptor/msgpack_tuple_decl.hpp"
+#include "msgpack/v3/adaptor/msgpack_tuple_decl.hpp"

 #endif // MSGPACK_MSGPACK_TUPLE_DECL_HPP
--- a/include/msgpack/adaptor/nil_decl.hpp
+++ b/include/msgpack/adaptor/nil_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/nil_decl.hpp"
 #include "msgpack/v2/adaptor/nil_decl.hpp"
+#include "msgpack/v3/adaptor/nil_decl.hpp"

 #endif // MSGPACK_TYPE_NIL_DECL_HPP
--- a/include/msgpack/adaptor/raw_decl.hpp
+++ b/include/msgpack/adaptor/raw_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/raw_decl.hpp"
 #include "msgpack/v2/adaptor/raw_decl.hpp"
+#include "msgpack/v3/adaptor/raw_decl.hpp"

 #endif // MSGPACK_TYPE_RAW_DECL_HPP
--- a/include/msgpack/adaptor/size_equal_only_decl.hpp
+++ b/include/msgpack/adaptor/size_equal_only_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/size_equal_only_decl.hpp"
 #include "msgpack/v2/adaptor/size_equal_only_decl.hpp"
+#include "msgpack/v3/adaptor/size_equal_only_decl.hpp"

 #endif // MSGPACK_TYPE_SIZE_EQUAL_ONLY_DECL_HPP
--- a/include/msgpack/adaptor/tr1/unordered_map.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_map.hpp
@@ -84,7 +84,7 @@ struct object_with_zone<MSGPACK_STD_TR1::unordered_map<K, V, Hash, Pred, Alloc>
            o.via.map.size = 0;
        } else {
            uint32_t size = checked_get_container_size(v.size());
-            msgpack::object_kv* p = static_cast<msgpack::object_kv*>(o.zone.allocate_align(sizeof(msgpack::object_kv)*size));
+            msgpack::object_kv* p = static_cast<msgpack::object_kv*>(o.zone.allocate_align(sizeof(msgpack::object_kv)*size, MSGPACK_ZONE_ALIGNOF(msgpack::object_kv)));
            msgpack::object_kv* const pend = p + size;
            o.via.map.ptr  = p;
            o.via.map.size = size;
@@ -141,7 +141,7 @@ struct object_with_zone<MSGPACK_STD_TR1::unordered_multimap<K, V, Hash, Pred, Al
            o.via.map.size = 0;
        } else {
            uint32_t size = checked_get_container_size(v.size());
-            msgpack::object_kv* p = static_cast<msgpack::object_kv*>(o.zone.allocate_align(sizeof(msgpack::object_kv)*size));
+            msgpack::object_kv* p = static_cast<msgpack::object_kv*>(o.zone.allocate_align(sizeof(msgpack::object_kv)*size, MSGPACK_ZONE_ALIGNOF(msgpack::object_kv)));
            msgpack::object_kv* const pend = p + size;
            o.via.map.ptr  = p;
            o.via.map.size = size;
--- a/include/msgpack/adaptor/tr1/unordered_set.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_set.hpp
@@ -82,7 +82,7 @@ struct object_with_zone<MSGPACK_STD_TR1::unordered_set<T, Hash, Compare, Alloc>
            o.via.array.size = 0;
        } else {
            uint32_t size = checked_get_container_size(v.size());
-            msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*size));
+            msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*size, MSGPACK_ZONE_ALIGNOF(msgpack::object)));
            msgpack::object* const pend = p + size;
            o.via.array.ptr = p;
            o.via.array.size = size;
@@ -136,7 +136,7 @@ struct object_with_zone<MSGPACK_STD_TR1::unordered_multiset<T, Hash, Compare, Al
            o.via.array.size = 0;
        } else {
            uint32_t size = checked_get_container_size(v.size());
-            msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*size));
+            msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*size, MSGPACK_ZONE_ALIGNOF(msgpack::object)));
            msgpack::object* const pend = p + size;
            o.via.array.ptr = p;
            o.via.array.size = size;
--- a/include/msgpack/adaptor/v4raw_decl.hpp
+++ b/include/msgpack/adaptor/v4raw_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/adaptor/v4raw_decl.hpp"
 #include "msgpack/v2/adaptor/v4raw_decl.hpp"
+#include "msgpack/v3/adaptor/v4raw_decl.hpp"

 #endif // MSGPACK_TYPE_V4RAW_DECL_HPP
--- a/include/msgpack/adaptor/wstring.hpp
+++ b/include/msgpack/adaptor/wstring.hpp
@@ -0,0 +1,15 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef MSGPACK_TYPE_WSTRING_HPP
+#define MSGPACK_TYPE_WSTRING_HPP
+
+#include "msgpack/v1/adaptor/wstring.hpp"
+
+#endif // MSGPACK_TYPE_WSTRING_HPP
--- a/include/msgpack/cpp_config_decl.hpp
+++ b/include/msgpack/cpp_config_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/cpp_config_decl.hpp"
 #include "msgpack/v2/cpp_config_decl.hpp"
+#include "msgpack/v3/cpp_config_decl.hpp"

 #endif // MSGPACK_CPP_CONFIG_DECL_HPP
--- a/include/msgpack/create_object_visitor.hpp
+++ b/include/msgpack/create_object_visitor.hpp
@@ -0,0 +1,17 @@
+//
+// MessagePack for C++ deserializing routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef MSGPACK_CREATE_OBJECT_VISITOR_HPP
+#define MSGPACK_CREATE_OBJECT_VISITOR_HPP
+
+#include "msgpack/create_object_visitor_decl.hpp"
+
+#include "msgpack/v2/create_object_visitor.hpp"
+
+#endif // MSGPACK_CREATE_OBJECT_VISITOR_HPP
--- a/include/msgpack/create_object_visitor_decl.hpp
+++ b/include/msgpack/create_object_visitor_decl.hpp
@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ deserializing routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef MSGPACK_CREATE_OBJECT_VISITOR_DECL_HPP
+#define MSGPACK_CREATE_OBJECT_VISITOR_DECL_HPP
+
+#include "msgpack/v2/create_object_visitor_decl.hpp"
+#include "msgpack/v3/create_object_visitor_decl.hpp"
+
+#endif // MSGPACK_CREATE_OBJECT_VISITOR_DECL_HPP
--- a/include/msgpack/fbuffer_decl.hpp
+++ b/include/msgpack/fbuffer_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/fbuffer_decl.hpp"
 #include "msgpack/v2/fbuffer_decl.hpp"
+#include "msgpack/v3/fbuffer_decl.hpp"

 #endif // MSGPACK_FBUFFER_DECL_HPP
--- a/include/msgpack/iterator_decl.hpp
+++ b/include/msgpack/iterator_decl.hpp
@@ -13,5 +13,6 @@

 #include <msgpack/v1/iterator_decl.hpp>
 #include <msgpack/v2/iterator_decl.hpp>
+#include <msgpack/v3/iterator_decl.hpp>

-#endif // MSGPACK_V1_ITERATOR_DECL_HPP
+#endif // MSGPACK_ITERATOR_DECL_HPP
--- a/include/msgpack/meta_decl.hpp
+++ b/include/msgpack/meta_decl.hpp
@@ -13,5 +13,6 @@

 #include "msgpack/v1/meta_decl.hpp"
 #include "msgpack/v2/meta_decl.hpp"
+#include "msgpack/v3/meta_decl.hpp"

 #endif // MSGPACK_META_DECL_HPP
--- a/include/msgpack/null_visitor.hpp
+++ b/include/msgpack/null_visitor.hpp
@@ -0,0 +1,17 @@
+//
+// MessagePack for C++ deserializing routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef MSGPACK_NULL_VISITOR_HPP
+#define MSGPACK_NULL_VISITOR_HPP
+
+#include "msgpack/null_visitor_decl.hpp"
+
+#include "msgpack/v2/null_visitor.hpp"
+
+#endif // MSGPACK_NULL_VISITOR_HPP
--- a/include/msgpack/null_visitor_decl.hpp
+++ b/include/msgpack/null_visitor_decl.hpp
@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ deserializing routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef MSGPACK_NULL_VISITOR_DECL_HPP
+#define MSGPACK_NULL_VISITOR_DECL_HPP
+
+#include "msgpack/v2/null_visitor_decl.hpp"
+#include "msgpack/v3/null_visitor_decl.hpp"
+
+#endif // MSGPACK_NULL_VISITOR_DECL_HPP
--- a/include/msgpack/object.h
+++ b/include/msgpack/object.h
@@ -97,8 +97,10 @@ typedef struct msgpack_object_kv {
    msgpack_object val;
 } msgpack_object_kv;

+#if !defined(_KERNEL_MODE)
 MSGPACK_DLLEXPORT
 void msgpack_object_print(FILE* out, msgpack_object o);
+#endif

 MSGPACK_DLLEXPORT
 int msgpack_object_print_buffer(char *buffer, size_t buffer_size, msgpack_object o);
--- a/include/msgpack/object_decl.hpp
+++ b/include/msgpack/object_decl.hpp
@@ -13,5 +13,6 @@

 #include "msgpack/v1/object_decl.hpp"
 #include "msgpack/v2/object_decl.hpp"
+#include "msgpack/v3/object_decl.hpp"

 #endif // MSGPACK_OBJECT_DECL_HPP
--- a/include/msgpack/object_fwd.hpp
+++ b/include/msgpack/object_fwd.hpp
@@ -15,5 +15,6 @@

 #include "msgpack/v1/object_fwd.hpp"
 #include "msgpack/v2/object_fwd.hpp"
+#include "msgpack/v3/object_fwd.hpp"

 #endif // MSGPACK_OBJECT_FWD_HPP
--- a/include/msgpack/object_fwd_decl.hpp
+++ b/include/msgpack/object_fwd_decl.hpp
@@ -13,5 +13,6 @@

 #include "msgpack/v1/object_fwd_decl.hpp"
 #include "msgpack/v2/object_fwd_decl.hpp"
+#include "msgpack/v3/object_fwd_decl.hpp"

 #endif // MSGPACK_OBJECT_FWD_DECL_HPP
--- a/include/msgpack/pack.h
+++ b/include/msgpack/pack.h
@@ -12,6 +12,7 @@

 #include "pack_define.h"
 #include "object.h"
+#include "timestamp.h"
 #include <stdlib.h>

 #ifdef __cplusplus
@@ -98,6 +99,9 @@ static int msgpack_pack_bin_body(msgpack_packer* pk, const void* b, size_t l);
 static int msgpack_pack_ext(msgpack_packer* pk, size_t l, int8_t type);
 static int msgpack_pack_ext_body(msgpack_packer* pk, const void* b, size_t l);

+static int msgpack_pack_timestamp(msgpack_packer* pk, const msgpack_timestamp* d);
+
+MSGPACK_DLLEXPORT
 int msgpack_pack_object(msgpack_packer* pk, msgpack_object d);


--- a/include/msgpack/pack_decl.hpp
+++ b/include/msgpack/pack_decl.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/pack_decl.hpp"
 #include "msgpack/v2/pack_decl.hpp"
+#include "msgpack/v3/pack_decl.hpp"

 #endif // MSGPACK_PACK_DECL_HPP
--- a/include/msgpack/pack_template.h
+++ b/include/msgpack/pack_template.h
@@ -34,6 +34,10 @@
 #error msgpack_pack_append_buffer callback is not defined
 #endif

+#if defined(_MSC_VER)
+#   pragma warning(push)
+#   pragma warning(disable : 4204)   /* nonstandard extension used: non-constant aggregate initializer */
+#endif

 /*
 * Integer
@@ -834,31 +838,31 @@ msgpack_pack_inline_func(_ext)(msgpack_pack_user x, size_t l, int8_t type)
    case 1: {
        unsigned char buf[2];
        buf[0] = 0xd4;
-        buf[1] = type;
+        buf[1] = (unsigned char)type;
        msgpack_pack_append_buffer(x, buf, 2);
    } break;
    case 2: {
        unsigned char buf[2];
        buf[0] = 0xd5;
-        buf[1] = type;
+        buf[1] = (unsigned char)type;
        msgpack_pack_append_buffer(x, buf, 2);
    } break;
    case 4: {
        unsigned char buf[2];
        buf[0] = 0xd6;
-        buf[1] = type;
+        buf[1] = (unsigned char)type;
        msgpack_pack_append_buffer(x, buf, 2);
    } break;
    case 8: {
        unsigned char buf[2];
        buf[0] = 0xd7;
-        buf[1] = type;
+        buf[1] = (unsigned char)type;
        msgpack_pack_append_buffer(x, buf, 2);
    } break;
    case 16: {
        unsigned char buf[2];
        buf[0] = 0xd8;
-        buf[1] = type;
+        buf[1] = (unsigned char)type;
        msgpack_pack_append_buffer(x, buf, 2);
    } break;
    default:
@@ -866,19 +870,19 @@ msgpack_pack_inline_func(_ext)(msgpack_pack_user x, size_t l, int8_t type)
            unsigned char buf[3];
            buf[0] = 0xc7;
            buf[1] = (unsigned char)l;
-            buf[2] = type;
+            buf[2] = (unsigned char)type;
            msgpack_pack_append_buffer(x, buf, 3);
        } else if(l < 65536) {
            unsigned char buf[4];
            buf[0] = 0xc8;
            _msgpack_store16(&buf[1], l);
-            buf[3] = type;
+            buf[3] = (unsigned char)type;
            msgpack_pack_append_buffer(x, buf, 4);
        } else {
            unsigned char buf[6];
            buf[0] = 0xc9;
            _msgpack_store32(&buf[1], l);
-            buf[5] = type;
+            buf[5] = (unsigned char)type;
            msgpack_pack_append_buffer(x, buf, 6);
        }
        break;
@@ -890,6 +894,34 @@ msgpack_pack_inline_func(_ext_body)(msgpack_pack_user x, const void* b, size_t l
    msgpack_pack_append_buffer(x, (const unsigned char*)b, l);
 }

+msgpack_pack_inline_func(_timestamp)(msgpack_pack_user x, const msgpack_timestamp* d)
+{
+    if ((((int64_t)d->tv_sec) >> 34) == 0) {
+        uint64_t data64 = ((uint64_t) d->tv_nsec << 34) | (uint64_t)d->tv_sec;
+        if ((data64 & 0xffffffff00000000L) == 0)   {
+            // timestamp 32
+            char buf[4];
+            uint32_t data32 = (uint32_t)data64;
+            msgpack_pack_ext(x, 4, -1);
+            _msgpack_store32(buf, data32);
+            msgpack_pack_append_buffer(x, buf, 4);
+        } else {
+            // timestamp 64
+            char buf[8];
+            msgpack_pack_ext(x, 8, -1);
+            _msgpack_store64(buf, data64);
+            msgpack_pack_append_buffer(x, buf, 8);
+        }
+    } else  {
+        // timestamp 96
+        char buf[12];
+        _msgpack_store32(&buf[0], d->tv_nsec);
+        _msgpack_store64(&buf[4], d->tv_sec);
+        msgpack_pack_ext(x, 12, -1);
+        msgpack_pack_append_buffer(x, buf, 12);
+    }
+}
+
 #undef msgpack_pack_inline_func
 #undef msgpack_pack_user
 #undef msgpack_pack_append_buffer
@@ -907,3 +939,7 @@ msgpack_pack_inline_func(_ext_body)(msgpack_pack_user x, const void* b, size_t l
 #undef msgpack_pack_real_int16
 #undef msgpack_pack_real_int32
 #undef msgpack_pack_real_int64
+
+#if defined(_MSC_VER)
+#   pragma warning(pop)
+#endif
--- a/include/msgpack/parse.hpp
+++ b/include/msgpack/parse.hpp
@@ -0,0 +1,18 @@
+//
+// MessagePack for C++ deserializing routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef MSGPACK_PARSE_HPP
+#define MSGPACK_PARSE_HPP
+
+#include "msgpack/parse_decl.hpp"
+
+#include "msgpack/v2/parse.hpp"
+#include "msgpack/v3/parse.hpp"
+
+#endif // MSGPACK_PARSE_HPP
--- a/include/msgpack/parse_decl.hpp
+++ b/include/msgpack/parse_decl.hpp
@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ deserializing routine
+//
+// Copyright (C) 2018 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef MSGPACK_PARSE_DECL_HPP
+#define MSGPACK_PARSE_DECL_HPP
+
+#include "msgpack/v2/parse_decl.hpp"
+#include "msgpack/v3/parse_decl.hpp"
+
+#endif // MSGPACK_PARSE_DECL_HPP
--- a/include/msgpack/parse_return.hpp
+++ b/include/msgpack/parse_return.hpp
@@ -12,5 +12,6 @@

 #include "msgpack/v1/parse_return.hpp"
 #include "msgpack/v2/parse_return.hpp"
+#include "msgpack/v3/parse_return.hpp"

 #endif // MSGPACK_PARSE_RETURN_HPP
--- a/include/msgpack/predef/architecture.h
+++ b/include/msgpack/predef/architecture.h
@@ -19,6 +19,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #include <msgpack/predef/architecture/mips.h>
 #include <msgpack/predef/architecture/parisc.h>
 #include <msgpack/predef/architecture/ppc.h>
+#include <msgpack/predef/architecture/ptx.h>
 #include <msgpack/predef/architecture/pyramid.h>
 #include <msgpack/predef/architecture/rs6k.h>
 #include <msgpack/predef/architecture/sparc.h>
--- a/include/msgpack/predef/architecture/arm.h
+++ b/include/msgpack/predef/architecture/arm.h
@@ -27,11 +27,14 @@ http://www.boost.org/LICENSE_1_0.txt)
    [[`__TARGET_ARCH_ARM`] [__predef_detection__]]
    [[`__TARGET_ARCH_THUMB`] [__predef_detection__]]
    [[`_M_ARM`] [__predef_detection__]]
+    [[`_M_ARM64`] [__predef_detection__]]

    [[`__arm64`] [8.0.0]]
    [[`__TARGET_ARCH_ARM`] [V.0.0]]
    [[`__TARGET_ARCH_THUMB`] [V.0.0]]
+    [[`__ARM_ARCH`] [V.0.0]]
    [[`_M_ARM`] [V.0.0]]
+    [[`_M_ARM64`] [8.0.0]]
    ]
 */

@@ -39,7 +42,8 @@ http://www.boost.org/LICENSE_1_0.txt)

 #if defined(__arm__) || defined(__arm64) || defined(__thumb__) || \
    defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) || \
-    defined(_M_ARM)
+    defined(__ARM_ARCH) || \
+    defined(_M_ARM) || defined(_M_ARM64)
 #   undef MSGPACK_ARCH_ARM
 #   if !defined(MSGPACK_ARCH_ARM) && defined(__arm64)
 #       define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(8,0,0)
@@ -50,6 +54,12 @@ http://www.boost.org/LICENSE_1_0.txt)
 #   if !defined(MSGPACK_ARCH_ARM) && defined(__TARGET_ARCH_THUMB)
 #       define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0)
 #   endif
+#   if !defined(MSGPACK_ARCH_ARM) && defined(__ARM_ARCH)
+#       define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(__ARM_ARCH,0,0)
+#   endif
+#   if !defined(MSGPACK_ARCH_ARM) && defined(_M_ARM64)
+#       define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(8,0,0)
+#   endif
 #   if !defined(MSGPACK_ARCH_ARM) && defined(_M_ARM)
 #       define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(_M_ARM,0,0)
 #   endif
--- a/include/msgpack/predef/architecture/parisc.h
+++ b/include/msgpack/predef/architecture/parisc.h
@@ -12,7 +12,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #include <msgpack/predef/make.h>

 /*`
-[heading `MSGPACK_ARCH_PARISK`]
+[heading `MSGPACK_ARCH_PARISC`]

 [@http://en.wikipedia.org/wiki/PA-RISC_family HP/PA RISC] architecture.

--- a/include/msgpack/predef/architecture/ptx.h
+++ b/include/msgpack/predef/architecture/ptx.h
@@ -0,0 +1,44 @@
+/*
+Copyright Benjamin Worpitz 2018
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+#ifndef MSGPACK_PREDEF_ARCHITECTURE_PTX_H
+#define MSGPACK_PREDEF_ARCHITECTURE_PTX_H
+
+#include <msgpack/predef/version_number.h>
+#include <msgpack/predef/make.h>
+
+/*`
+[heading `MSGPACK_ARCH_PTX`]
+
+[@https://en.wikipedia.org/wiki/Parallel_Thread_Execution PTX] architecture.
+
+[table
+    [[__predef_symbol__] [__predef_version__]]
+
+    [[`__CUDA_ARCH__`] [__predef_detection__]]
+
+    [[`__CUDA_ARCH__`] [V.R.0]]
+    ]
+ */
+
+#define MSGPACK_ARCH_PTX MSGPACK_VERSION_NUMBER_NOT_AVAILABLE
+
+#if defined(__CUDA_ARCH__)
+#   undef MSGPACK_ARCH_PTX
+#   define MSGPACK_ARCH_PTX MSGPACK_PREDEF_MAKE_10_VR0(__CUDA_ARCH__)
+#endif
+
+#if MSGPACK_ARCH_PTX
+#   define MSGPACK_ARCH_PTX_AVAILABLE
+#endif
+
+#define MSGPACK_ARCH_PTX_NAME "PTX"
+
+#endif
+
+#include <msgpack/predef/detail/test.h>
+MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_ARCH_PTX,MSGPACK_ARCH_PTX_NAME)
--- a/include/msgpack/predef/compiler.h
+++ b/include/msgpack/predef/compiler.h
@@ -32,6 +32,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #include <msgpack/predef/compiler/metrowerks.h>
 #include <msgpack/predef/compiler/microtec.h>
 #include <msgpack/predef/compiler/mpw.h>
+#include <msgpack/predef/compiler/nvcc.h>
 #include <msgpack/predef/compiler/palm.h>
 #include <msgpack/predef/compiler/pgi.h>
 #include <msgpack/predef/compiler/sgi_mipspro.h>
--- a/include/msgpack/predef/compiler/intel.h
+++ b/include/msgpack/predef/compiler/intel.h
@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2015
+Copyright Rene Rivera 2008-2017
 Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE_1_0.txt or copy at
 http://www.boost.org/LICENSE_1_0.txt)
@@ -25,7 +25,8 @@ Version number available as major, minor, and patch.
    [[`__ICC`] [__predef_detection__]]
    [[`__ECC`] [__predef_detection__]]

-    [[`__INTEL_COMPILER`] [V.R.P]]
+    [[`__INTEL_COMPILER`] [V.R]]
+    [[`__INTEL_COMPILER` and `__INTEL_COMPILER_UPDATE`] [V.R.P]]
    ]
 */

@@ -33,8 +34,21 @@ Version number available as major, minor, and patch.

 #if defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || \
    defined(__ECC)
+/*`
+[note Because of an Intel mistake in the release version numbering when
+`__INTEL_COMPILER` is `9999` it is detected as version 12.1.0.]
+ */
+#   if !defined(MSGPACK_COMP_INTEL_DETECTION) && defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 9999)
+#       define MSGPACK_COMP_INTEL_DETECTION MSGPACK_VERSION_NUMBER(12,1,0)
+#   endif
+#   if !defined(MSGPACK_COMP_INTEL_DETECTION) && defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE)
+#       define MSGPACK_COMP_INTEL_DETECTION MSGPACK_VERSION_NUMBER( \
+            MSGPACK_VERSION_NUMBER_MAJOR(MSGPACK_PREDEF_MAKE_10_VVRR(__INTEL_COMPILER)), \
+            MSGPACK_VERSION_NUMBER_MINOR(MSGPACK_PREDEF_MAKE_10_VVRR(__INTEL_COMPILER)), \
+            __INTEL_COMPILER_UPDATE)
+#   endif
 #   if !defined(MSGPACK_COMP_INTEL_DETECTION) && defined(__INTEL_COMPILER)
-#       define MSGPACK_COMP_INTEL_DETECTION MSGPACK_PREDEF_MAKE_10_VRP(__INTEL_COMPILER)
+#       define MSGPACK_COMP_INTEL_DETECTION MSGPACK_PREDEF_MAKE_10_VVRR(__INTEL_COMPILER)
 #   endif
 #   if !defined(MSGPACK_COMP_INTEL_DETECTION)
 #       define MSGPACK_COMP_INTEL_DETECTION MSGPACK_VERSION_NUMBER_AVAILABLE
--- a/include/msgpack/predef/compiler/nvcc.h
+++ b/include/msgpack/predef/compiler/nvcc.h
@@ -0,0 +1,60 @@
+/*
+Copyright Benjamin Worpitz 2018
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+#ifndef MSGPACK_PREDEF_COMPILER_NVCC_H
+#define MSGPACK_PREDEF_COMPILER_NVCC_H
+
+#include <msgpack/predef/version_number.h>
+#include <msgpack/predef/make.h>
+
+/*`
+[heading `MSGPACK_COMP_NVCC`]
+
+[@https://en.wikipedia.org/wiki/NVIDIA_CUDA_Compiler NVCC] compiler.
+Version number available as major, minor, and patch beginning with version 7.5.
+
+[table
+    [[__predef_symbol__] [__predef_version__]]
+
+    [[`__NVCC__`] [__predef_detection__]]
+
+    [[`__CUDACC_VER_MAJOR__`, `__CUDACC_VER_MINOR__`, `__CUDACC_VER_BUILD__`] [V.R.P]]
+    ]
+ */
+
+#define MSGPACK_COMP_NVCC MSGPACK_VERSION_NUMBER_NOT_AVAILABLE
+
+#if defined(__NVCC__)
+#   if !defined(__CUDACC_VER_MAJOR__) || !defined(__CUDACC_VER_MINOR__) || !defined(__CUDACC_VER_BUILD__)
+#       define MSGPACK_COMP_NVCC_DETECTION MSGPACK_VERSION_NUMBER_AVAILABLE
+#   else
+#       define MSGPACK_COMP_NVCC_DETECTION MSGPACK_VERSION_NUMBER(__CUDACC_VER_MAJOR__, __CUDACC_VER_MINOR__, __CUDACC_VER_BUILD__)
+#   endif
+#endif
+
+#ifdef MSGPACK_COMP_NVCC_DETECTION
+#   if defined(MSGPACK_PREDEF_DETAIL_COMP_DETECTED)
+#       define MSGPACK_COMP_NVCC_EMULATED MSGPACK_COMP_NVCC_DETECTION
+#   else
+#       undef MSGPACK_COMP_NVCC
+#       define MSGPACK_COMP_NVCC MSGPACK_COMP_NVCC_DETECTION
+#   endif
+#   define MSGPACK_COMP_NVCC_AVAILABLE
+#   include <msgpack/predef/detail/comp_detected.h>
+#endif
+
+#define MSGPACK_COMP_NVCC_NAME "NVCC"
+
+#endif
+
+#include <msgpack/predef/detail/test.h>
+MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_COMP_NVCC,MSGPACK_COMP_NVCC_NAME)
+
+#ifdef MSGPACK_COMP_NVCC_EMULATED
+#include <msgpack/predef/detail/test.h>
+MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_COMP_NVCC_EMULATED,MSGPACK_COMP_NVCC_NAME)
+#endif
--- a/include/msgpack/predef/compiler/visualc.h
+++ b/include/msgpack/predef/compiler/visualc.h
@@ -29,6 +29,10 @@ Version number available as major, minor, and patch.
    [[`_MSC_FULL_VER`] [V.R.P]]
    [[`_MSC_VER`] [V.R.0]]
    ]
+
+[note Release of Visual Studio after 2015 will no longer be identified
+by Boost Predef as the marketing version number. Instead we use the
+compiler version number directly, i.e. the _MSC_VER number.]
 */

 #define MSGPACK_COMP_MSVC MSGPACK_VERSION_NUMBER_NOT_AVAILABLE
@@ -53,8 +57,18 @@ Version number available as major, minor, and patch.
    means that the compiler and VS product versions are no longer
    in sync. Hence we need to use different formulas for
    mapping from MSC version to VS product version.
+
+    VS2017 is a total nightmare when it comes to version numbers.
+    Hence to avoid arguments relating to that both present and
+    future.. Any version after VS2015 will use solely the compiler
+    version, i.e. cl.exe, as the version number here.
    */
-#   if (_MSC_VER >= 1900)
+#   if (_MSC_VER > 1900)
+#       define MSGPACK_COMP_MSVC_DETECTION MSGPACK_VERSION_NUMBER(\
+            _MSC_VER/100,\
+            _MSC_VER%100,\
+            MSGPACK_COMP_MSVC_BUILD)
+#   elif (_MSC_VER >= 1900)
 #       define MSGPACK_COMP_MSVC_DETECTION MSGPACK_VERSION_NUMBER(\
            _MSC_VER/100-5,\
            _MSC_VER%100,\
--- a/include/msgpack/predef/hardware/simd/arm.h
+++ b/include/msgpack/predef/hardware/simd/arm.h
@@ -24,6 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt)
     [[`__ARM_NEON__`] [__predef_detection__]]
     [[`__aarch64__`] [__predef_detection__]]
     [[`_M_ARM`] [__predef_detection__]]
+     [[`_M_ARM64`] [__predef_detection__]]
     ]

 [table
@@ -32,6 +33,7 @@ http://www.boost.org/LICENSE_1_0.txt)
     [[`__ARM_NEON__`] [MSGPACK_HW_SIMD_ARM_NEON_VERSION]]
     [[`__aarch64__`] [MSGPACK_HW_SIMD_ARM_NEON_VERSION]]
     [[`_M_ARM`] [MSGPACK_HW_SIMD_ARM_NEON_VERSION]]
+     [[`_M_ARM64`] [MSGPACK_HW_SIMD_ARM_NEON_VERSION]]
     ]

 */
@@ -39,7 +41,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define MSGPACK_HW_SIMD_ARM MSGPACK_VERSION_NUMBER_NOT_AVAILABLE

 #undef MSGPACK_HW_SIMD_ARM
-#if !defined(MSGPACK_HW_SIMD_ARM) && (defined(__ARM_NEON__) || defined(__aarch64__) || defined (_M_ARM))
+#if !defined(MSGPACK_HW_SIMD_ARM) && (defined(__ARM_NEON__) || defined(__aarch64__) || defined (_M_ARM) || defined (_M_ARM64))
 #   define MSGPACK_HW_SIMD_ARM MSGPACK_HW_SIMD_ARM_NEON_VERSION
 #endif

--- a/include/msgpack/predef/hardware/simd/x86_amd/versions.h
+++ b/include/msgpack/predef/hardware/simd/x86_amd/versions.h
@@ -21,7 +21,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 // ---------------------------------

 /*`
- [heading `MSGPACK_HW_SIMD_X86_SSE4A_VERSION`]
+ [heading `MSGPACK_HW_SIMD_X86_AMD_SSE4A_VERSION`]

 [@https://en.wikipedia.org/wiki/SSE4##SSE4A SSE4A] x86 extension (AMD specific).

@@ -30,7 +30,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define MSGPACK_HW_SIMD_X86_AMD_SSE4A_VERSION MSGPACK_VERSION_NUMBER(4, 0, 0)

 /*`
- [heading `MSGPACK_HW_SIMD_X86_FMA4_VERSION`]
+ [heading `MSGPACK_HW_SIMD_X86_AMD_FMA4_VERSION`]

 [@https://en.wikipedia.org/wiki/FMA_instruction_set#FMA4_instruction_set FMA4] x86 extension (AMD specific).

@@ -39,7 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define MSGPACK_HW_SIMD_X86_AMD_FMA4_VERSION MSGPACK_VERSION_NUMBER(5, 1, 0)

 /*`
- [heading `MSGPACK_HW_SIMD_X86_XOP_VERSION`]
+ [heading `MSGPACK_HW_SIMD_X86_AMD_XOP_VERSION`]

 [@https://en.wikipedia.org/wiki/XOP_instruction_set XOP] x86 extension (AMD specific).

--- a/include/msgpack/predef/language.h
+++ b/include/msgpack/predef/language.h
@@ -13,5 +13,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 #include <msgpack/predef/language/stdc.h>
 #include <msgpack/predef/language/stdcpp.h>
 #include <msgpack/predef/language/objc.h>
+#include <msgpack/predef/language/cuda.h>

 #endif
--- a/include/msgpack/predef/language/cuda.h
+++ b/include/msgpack/predef/language/cuda.h
@@ -0,0 +1,52 @@
+/*
+Copyright Benjamin Worpitz 2018
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+#ifndef MSGPACK_PREDEF_LANGUAGE_CUDA_H
+#define MSGPACK_PREDEF_LANGUAGE_CUDA_H
+
+#include <msgpack/predef/version_number.h>
+#include <msgpack/predef/make.h>
+
+/*`
+[heading `MSGPACK_LANG_CUDA`]
+
+[@https://en.wikipedia.org/wiki/CUDA CUDA C/C++] language.
+If available, the version is detected as VV.RR.P.
+
+[table
+    [[__predef_symbol__] [__predef_version__]]
+
+    [[`__CUDACC__`] [__predef_detection__]]
+    [[`__CUDA__`] [__predef_detection__]]
+
+    [[`CUDA_VERSION`] [VV.RR.P]]
+    ]
+ */
+
+#define MSGPACK_LANG_CUDA MSGPACK_VERSION_NUMBER_NOT_AVAILABLE
+
+#if defined(__CUDACC__) || defined(__CUDA__)
+#   undef MSGPACK_LANG_CUDA
+#   include <cuda.h>
+#   if defined(CUDA_VERSION)
+#       define MSGPACK_LANG_CUDA MSGPACK_PREDEF_MAKE_10_VVRRP(CUDA_VERSION)
+#   else
+#       define MSGPACK_LANG_CUDA MSGPACK_VERSION_NUMBER_AVAILABLE
+#   endif
+#endif
+
+#if MSGPACK_LANG_CUDA
+#   define MSGPACK_LANG_CUDA_AVAILABLE
+#endif
+
+#define MSGPACK_LANG_CUDA_NAME "CUDA C/C++"
+
+
+#endif
+
+#include <msgpack/predef/detail/test.h>
+MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_LANG_CUDA,MSGPACK_LANG_CUDA_NAME)
--- a/include/msgpack/predef/library/c.h
+++ b/include/msgpack/predef/library/c.h
@@ -12,6 +12,7 @@ http://www.boost.org/LICENSE_1_0.txt)

 #include <msgpack/predef/library/c/_prefix.h>

+#include <msgpack/predef/library/c/cloudabi.h>
 #include <msgpack/predef/library/c/gnu.h>
 #include <msgpack/predef/library/c/uc.h>
 #include <msgpack/predef/library/c/vms.h>
--- a/include/msgpack/predef/library/c/cloudabi.h
+++ b/include/msgpack/predef/library/c/cloudabi.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2017 James E. King III
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ *   http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+#ifndef MSGPACK_PREDEF_LIBRARY_C_CLOUDABI_H
+#define MSGPACK_PREDEF_LIBRARY_C_CLOUDABI_H
+
+#include <msgpack/predef/version_number.h>
+#include <msgpack/predef/make.h>
+
+#include <msgpack/predef/library/c/_prefix.h>
+
+#if defined(__CloudABI__)
+#include <stddef.h>
+#endif
+
+/*`
+[heading `MSGPACK_LIB_C_CLOUDABI`]
+
+[@https://github.com/NuxiNL/cloudlibc cloudlibc] - CloudABI's standard C library.
+Version number available as major, and minor.
+
+[table
+    [[__predef_symbol__] [__predef_version__]]
+
+    [[`__cloudlibc__`] [__predef_detection__]]
+
+    [[`__cloudlibc_major__`, `__cloudlibc_minor__`] [V.R.0]]
+    ]
+ */
+
+#define MSGPACK_LIB_C_CLOUDABI MSGPACK_VERSION_NUMBER_NOT_AVAILABLE
+
+#if defined(__cloudlibc__)
+#   undef MSGPACK_LIB_C_CLOUDABI
+#   define MSGPACK_LIB_C_CLOUDABI \
+            MSGPACK_VERSION_NUMBER(__cloudlibc_major__,__cloudlibc_minor__,0)
+#endif
+
+#if MSGPACK_LIB_C_CLOUDABI
+#   define MSGPACK_LIB_C_CLOUDABI_AVAILABLE
+#endif
+
+#define MSGPACK_LIB_C_CLOUDABI_NAME "cloudlibc"
+
+#endif
+
+#include <msgpack/predef/detail/test.h>
+MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_LIB_C_CLOUDABI,MSGPACK_LIB_C_CLOUDABI_NAME)
--- a/include/msgpack/predef/make.h
+++ b/include/msgpack/predef/make.h
@@ -46,10 +46,14 @@ Macros are:
 #define MSGPACK_PREDEF_MAKE_0X_VVRRPP(V) MSGPACK_VERSION_NUMBER((V&0xFF0000)>>16,(V&0xFF00)>>8,(V&0xFF))
 /*` `MSGPACK_PREDEF_MAKE_10_VPPP(V)` */
 #define MSGPACK_PREDEF_MAKE_10_VPPP(V) MSGPACK_VERSION_NUMBER(((V)/1000)%10,0,(V)%1000)
+/*` `MSGPACK_PREDEF_MAKE_10_VR0(V)` */
+#define MSGPACK_PREDEF_MAKE_10_VR0(V) MSGPACK_VERSION_NUMBER(((V)/100)%10,((V)/10)%10,0)
 /*` `MSGPACK_PREDEF_MAKE_10_VRP(V)` */
 #define MSGPACK_PREDEF_MAKE_10_VRP(V) MSGPACK_VERSION_NUMBER(((V)/100)%10,((V)/10)%10,(V)%10)
 /*` `MSGPACK_PREDEF_MAKE_10_VRP000(V)` */
 #define MSGPACK_PREDEF_MAKE_10_VRP000(V) MSGPACK_VERSION_NUMBER(((V)/100000)%10,((V)/10000)%10,((V)/1000)%10)
+/*` `MSGPACK_PREDEF_MAKE_10_VRPPPP(V)` */
+#define MSGPACK_PREDEF_MAKE_10_VRPPPP(V) MSGPACK_VERSION_NUMBER(((V)/100000)%10,((V)/10000)%10,(V)%10000)
 /*` `MSGPACK_PREDEF_MAKE_10_VRPP(V)` */
 #define MSGPACK_PREDEF_MAKE_10_VRPP(V) MSGPACK_VERSION_NUMBER(((V)/1000)%10,((V)/100)%10,(V)%100)
 /*` `MSGPACK_PREDEF_MAKE_10_VRR(V)` */
@@ -62,8 +66,12 @@ Macros are:
 #define MSGPACK_PREDEF_MAKE_10_VV00(V) MSGPACK_VERSION_NUMBER(((V)/100)%100,0,0)
 /*` `MSGPACK_PREDEF_MAKE_10_VVRR(V)` */
 #define MSGPACK_PREDEF_MAKE_10_VVRR(V) MSGPACK_VERSION_NUMBER(((V)/100)%100,(V)%100,0)
+/*` `MSGPACK_PREDEF_MAKE_10_VVRRP(V)` */
+#define MSGPACK_PREDEF_MAKE_10_VVRRP(V) MSGPACK_VERSION_NUMBER(((V)/1000)%100,((V)/10)%100,(V)%10)
 /*` `MSGPACK_PREDEF_MAKE_10_VVRRPP(V)` */
 #define MSGPACK_PREDEF_MAKE_10_VVRRPP(V) MSGPACK_VERSION_NUMBER(((V)/10000)%100,((V)/100)%100,(V)%100)
+/*` `MSGPACK_PREDEF_MAKE_10_VVRRPPP(V)` */
+#define MSGPACK_PREDEF_MAKE_10_VVRRPPP(V) MSGPACK_VERSION_NUMBER(((V)/100000)%100,((V)/1000)%100,(V)%1000)
 /*` `MSGPACK_PREDEF_MAKE_10_VVRR0PP00(V)` */
 #define MSGPACK_PREDEF_MAKE_10_VVRR0PP00(V) MSGPACK_VERSION_NUMBER(((V)/10000000)%100,((V)/100000)%100,((V)/100)%100)
 /*` `MSGPACK_PREDEF_MAKE_10_VVRR0PPPP(V)` */
--- a/include/msgpack/predef/os/android.h
+++ b/include/msgpack/predef/os/android.h
@@ -5,8 +5,8 @@ Distributed under the Boost Software License, Version 1.0.
 http://www.boost.org/LICENSE_1_0.txt)
 */

-#ifndef MSGPACK_PREDEF_OS_ADROID_H
-#define MSGPACK_PREDEF_OS_ADROID_H
+#ifndef MSGPACK_PREDEF_OS_ANDROID_H
+#define MSGPACK_PREDEF_OS_ANDROID_H

 #include <msgpack/predef/version_number.h>
 #include <msgpack/predef/make.h>
--- a/include/msgpack/predef/os/bsd/free.h
+++ b/include/msgpack/predef/os/bsd/free.h
@@ -34,13 +34,20 @@ http://www.boost.org/LICENSE_1_0.txt)
 #       define MSGPACK_OS_BSD_AVAILABLE
 #   endif
 #   undef MSGPACK_OS_BSD_FREE
+#   include <sys/param.h>
 #   if defined(__FreeBSD_version)
-#       if __FreeBSD_version < 500000
+#       if __FreeBSD_version == 491000
 #           define MSGPACK_OS_BSD_FREE \
-                MSGPACK_PREDEF_MAKE_10_VRP000(__FreeBSD_version)
+                MSGPACK_VERSION_NUMBER(4, 10, 0)
+#       elif __FreeBSD_version == 492000
+#           define MSGPACK_OS_BSD_FREE \
+                MSGPACK_VERSION_NUMBER(4, 11, 0)
+#       elif __FreeBSD_version < 500000
+#           define MSGPACK_OS_BSD_FREE \
+                MSGPACK_PREDEF_MAKE_10_VRPPPP(__FreeBSD_version)
 #       else
 #           define MSGPACK_OS_BSD_FREE \
-                MSGPACK_PREDEF_MAKE_10_VRR000(__FreeBSD_version)
+                MSGPACK_PREDEF_MAKE_10_VVRRPPP(__FreeBSD_version)
 #       endif
 #   else
 #       define MSGPACK_OS_BSD_FREE MSGPACK_VERSION_NUMBER_AVAILABLE
--- a/include/msgpack/predef/os/bsd/open.h
+++ b/include/msgpack/predef/os/bsd/open.h
@@ -50,6 +50,26 @@ http://www.boost.org/LICENSE_1_0.txt)
    [[`OpenBSD4_7`] [4.7.0]]
    [[`OpenBSD4_8`] [4.8.0]]
    [[`OpenBSD4_9`] [4.9.0]]
+    [[`OpenBSD5_0`] [5.0.0]]
+    [[`OpenBSD5_1`] [5.1.0]]
+    [[`OpenBSD5_2`] [5.2.0]]
+    [[`OpenBSD5_3`] [5.3.0]]
+    [[`OpenBSD5_4`] [5.4.0]]
+    [[`OpenBSD5_5`] [5.5.0]]
+    [[`OpenBSD5_6`] [5.6.0]]
+    [[`OpenBSD5_7`] [5.7.0]]
+    [[`OpenBSD5_8`] [5.8.0]]
+    [[`OpenBSD5_9`] [5.9.0]]
+    [[`OpenBSD6_0`] [6.0.0]]
+    [[`OpenBSD6_1`] [6.1.0]]
+    [[`OpenBSD6_2`] [6.2.0]]
+    [[`OpenBSD6_3`] [6.3.0]]
+    [[`OpenBSD6_4`] [6.4.0]]
+    [[`OpenBSD6_5`] [6.5.0]]
+    [[`OpenBSD6_6`] [6.6.0]]
+    [[`OpenBSD6_7`] [6.7.0]]
+    [[`OpenBSD6_8`] [6.8.0]]
+    [[`OpenBSD6_9`] [6.9.0]]
    ]
 */

@@ -153,6 +173,66 @@ http://www.boost.org/LICENSE_1_0.txt)
 #   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD4_9)
 #       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(4,9,0)
 #   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD5_0)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(5,0,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD5_1)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(5,1,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD5_2)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(5,2,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD5_3)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(5,3,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD5_4)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(5,4,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD5_5)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(5,5,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD5_6)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(5,6,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD5_7)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(5,7,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD5_8)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(5,8,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD5_9)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(5,9,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD6_0)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(6,0,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD6_1)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(6,1,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD6_2)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(6,2,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD6_3)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(6,3,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD6_4)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(6,4,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD6_5)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(6,5,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD6_6)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(6,6,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD6_7)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(6,7,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD6_8)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(6,8,0)
+#   endif
+#   if !defined(MSGPACK_OS_BSD_OPEN) && defined(OpenBSD6_9)
+#       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER(6,9,0)
+#   endif
 #   if !defined(MSGPACK_OS_BSD_OPEN)
 #       define MSGPACK_OS_BSD_OPEN MSGPACK_VERSION_NUMBER_AVAILABLE
 #   endif
--- a/include/msgpack/predef/other/endian.h
+++ b/include/msgpack/predef/other/endian.h
@@ -148,8 +148,7 @@ information and acquired knowledge:
 #       undef MSGPACK_ENDIAN_BIG_BYTE
 #       define MSGPACK_ENDIAN_BIG_BYTE MSGPACK_VERSION_NUMBER_AVAILABLE
 #   endif
-#   if MSGPACK_ARCH_AMD64 || \
-        MSGPACK_ARCH_IA64 || \
+#   if MSGPACK_ARCH_IA64 || \
        MSGPACK_ARCH_X86 || \
        MSGPACK_ARCH_BLACKFIN
 #       undef MSGPACK_ENDIAN_LITTLE_BYTE
--- a/Show More
+++ b/Show More