Updated the wiki URL.

2025-10-21 15:51:44 +02:00 · 2015-04-03 14:13:45 +09:00
929 changed files with 27723 additions and 97408 deletions
--- a/.github/depends/boost.sh
+++ b/.github/depends/boost.sh
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-usage()
-{
-  cat <<EOL
-  -b   - 32-bit or 64-bit library, maybe 32, 64 or both
-  -t   - the toolset, maybe gcc, clang or both
-  -p   - installation prefix
-EOL
-}
-
-build_boost()
-{
-  ./b2 \
-      --toolset=$1 \
-      --prefix=$3/$2 \
-      --with-test \
-      --with-headers \
-      --with-chrono \
-      --with-context \
-      --with-filesystem \
-      --with-system \
-      --with-timer \
-      address-model=$2 \
-      install || exit 1
-}
-
-bit="64"
-toolset="gcc"
-prefix="$HOME/boost-prefix"
-
-while getopts "b:t:p:" c; do
-  case "$c" in
-    b)
-      bit="$OPTARG"
-      [ "$bit" != "32" ] && [ "$bit" != "64" ] && [ "$bit" != "both" ] && usage && exit 1
-      ;;
-    t)
-      toolset="$OPTARG"
-      [ "$toolset" != "gcc" ] && [ "$toolset" != "clang" ] && [ "$toolset" != "both" ] && usage && exit 1
-      ;;
-    p)
-      prefix="$OPTARG"
-      ;;
-    ?*)
-      echo "invalid arguments." && exit 1
-      ;;
-  esac
-done
-
-mkdir $prefix || exit 1
-wget https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 || exit 1
-tar xf boost_1_76_0.tar.bz2 || exit 1
-cd boost_1_76_0
-./bootstrap.sh || exit 1
-
-build()
-{
-  if [ "$bit" = "both" ]; then
-    build_boost $1 32 $prefix
-    build_boost $1 64 $prefix
-  else
-    build_boost $1 $bit $prefix
-  fi
-}
-
-if [ "$toolset" = "both" ]; then
-  build gcc
-  build clang
-else
-  build $toolset
-fi
--- a/.github/depends/zlib.sh
+++ b/.github/depends/zlib.sh
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-usage()
-{
-  cat <<EOL
-  -b   - 32-bit or 64-bit library, maybe 32 or 64
-  -p   - installation prefix
-EOL
-}
-
-bit="64"
-prefix="$HOME/zlib-prefix"
-
-while getopts "b:t:p:" c; do
-  case "$c" in
-    b)
-      bit="$OPTARG"
-      [ "$bit" != "32" ] && [ "$bit" != "64" ] && [ "$bit" != "both" ] && usage && exit 1
-      ;;
-    p)
-      prefix="$OPTARG"
-      ;;
-    ?*)
-      echo "invalid arguments." && exit 1
-      ;;
-  esac
-done
-
-mkdir $prefix || exit 1
-wget https://zlib.net/zlib-1.2.12.tar.gz || exit 1
-tar -xf zlib-1.2.12.tar.gz || exit 1
-cd zlib-1.2.12
-
-build()
-{
-  cmake \
-    -D CMAKE_BUILD_TYPE=Release \
-    -D CMAKE_INSTALL_PREFIX=$2/$1 \
-    -D CMAKE_C_FLAGS="-m$1" \
-    -D CMAKE_SHARED_LINKER_FLAGS="-m$1" \
-    -B build$1 \
-    -S .
-  cmake --build build$1 --target install
-}
-
-if [ "$bit" = "both" ]; then
-  build 32 $prefix
-  build 64 $prefix
-else
-  build $bit $prefix
-fi
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -1,73 +0,0 @@
-name: coverage
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-  push:
-    branches:
-    - cpp_master
-    tags:
-    - '*'
-
-jobs:
-  codecov:
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Install build dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install g++-10 cmake lcov -y
-        ./ci/set_gcc_10.sh
-
-    - name: Cache boost
-      id: cache-boost
-      uses: actions/cache@v1
-      with:
-        path: ~/boost-prefix/
-        key: ${{ runner.os }}-boost-64-1-76-0-2021-08-09
-
-    - name: Build boost
-      if: steps.cache-boost.outputs.cache-hit != 'true'
-      run: ./.github/depends/boost.sh -b 64 -t gcc -p $HOME/boost-prefix
-
-    - name: Cache zlib
-      id: cache-zlib
-      uses: actions/cache@v1
-      with:
-        path: ~/zlib-prefix/
-        key: ${{ runner.os }}-zlib-64-1-2-11-2021-08-09
-
-    - name: Build zlib
-      if: steps.cache-zlib.outputs.cache-hit != 'true'
-      run: ./.github/depends/zlib.sh -b 64 -p $HOME/zlib-prefix
-
-    - name: Compile tests
-      run: |
-        mkdir build
-        cmake \
-            -D MSGPACK_CXX20=ON \
-            -D MSGPACK_32BIT=OFF \
-            -D MSGPACK_CHAR_SIGN=signed \
-            -D MSGPACK_USE_X3_PARSE=ON \
-            -D MSGPACK_BUILD_EXAMPLES=ON \
-            -D MSGPACK_BUILD_TESTS=ON \
-            -D CMAKE_BUILD_TYPE=Debug \
-            -D MSGPACK_GEN_COVERAGE=ON \
-            -D CMAKE_PREFIX_PATH="$HOME/zlib-prefix/64;$HOME/boost-prefix/64" \
-            -B build \
-            -S . || exit 1
-        cmake --build build --target all || exit 1
-        ctest --test-dir build || exit 1
-
-    - name: Upload coverage to Codecov
-      working-directory: build
-      run: |
-        # Create lcov report
-        lcov --capture --directory . --output-file coverage.info
-        lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files
-        lcov --list coverage.info # debug info
-        # Uploading report to CodeCov
-        bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
--- a/.github/workflows/gha.yml
+++ b/.github/workflows/gha.yml
@@ -1,237 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-  push:
-    branches:
-    - cpp_master
-    tags:
-    - '*'
-
-jobs:
-  macos:
-    name: ${{ format('macOS (pattern {0})', matrix.pattern) }}
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        pattern: [0, 1, 2, 3, 4]
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Cache boost
-      id: cache-boost
-      uses: actions/cache@v2
-      with:
-        path: ~/boost-prefix/
-        key: ${{ runner.os }}-boost-1-76-0-2021-08-09
-
-    - name: Build boost
-      if: steps.cache-boost.outputs.cache-hit != 'true'
-      run: ./.github/depends/boost.sh -b 64 -t clang -p $HOME/boost-prefix
-
-    - name: Cache zlib
-      id: cache-zlib
-      uses: actions/cache@v2
-      with:
-        path: ~/zlib-prefix/
-        key: ${{ runner.os }}-zlib-1-2-12-2021-08-09
-
-    - name: Build zlib
-      if: steps.cache-zlib.outputs.cache-hit != 'true'
-      run: ./.github/depends/zlib.sh -b 64 -p $HOME/zlib-prefix
-
-    - name: Build and test
-      shell: bash
-      run: |
-        # default configuration - overwrite its params later depending on matrix.pattern
-        export MSGPACK_CXX_VERSION="MSGPACK_CXX20=ON"
-        export ARCH=64
-        export API_VERSION=3
-        export CHAR_SIGN="signed"
-        export X3_PARSE="OFF"
-        export SANITIZE="-fsanitize=undefined -fno-sanitize-recover=all"
-
-        case ${{ matrix.pattern }} in
-          0)
-            export MSGPACK_CXX_VERSION="MSGPACK_CXX11=OFF"
-            ;;
-          1)
-            export API_VERSION=1
-            ;;
-          2)
-            export API_VERSION=2
-            ;;
-          3)
-            export X3_PARSE="ON"
-            ;;
-          4)
-            export CHAR_SIGN="unsigned"
-            ;;
-        esac
-
-        # build and test
-        export CXX="clang++"
-        CMAKE_CXX_COMPILER="$CXX" CXXFLAGS="-Werror -g ${SANITIZE}" ci/build_cmake.sh || exit 1
-
-        cat Files.cmake| grep ".*\.[h|hpp]" | perl -pe 's/ //g' | sort > tmp1  && find include -name "*.h" -o -name "*.hpp" | sort > tmp2 && diff tmp1 tmp2
-
-  linux:
-    name: ${{ format('Linux (pattern {0})', matrix.pattern) }}
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        pattern: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Install build dependencies
-      shell: bash
-      run: |
-        sudo apt-get update
-        sudo apt-get install g++-10 cmake valgrind -y
-        sudo apt-get install g++-10-multilib -y  # for 32-bit compile
-        ./ci/set_gcc_10.sh
-
-    - name: Cache boost
-      id: cache-boost
-      uses: actions/cache@v2
-      with:
-        path: ~/boost-prefix/
-        key: ${{ runner.os }}-boost-1-76-0-2021-08-09
-
-    - name: Build boost
-      if: steps.cache-boost.outputs.cache-hit != 'true'
-      run: ./.github/depends/boost.sh -b both -t gcc -p $HOME/boost-prefix
-
-    - name: Cache zlib
-      id: cache-zlib
-      uses: actions/cache@v2
-      with:
-        path: ~/zlib-prefix/
-        key: ${{ runner.os }}-zlib-1-2-12-2021-08-09
-
-    - name: Build zlib
-      if: steps.cache-zlib.outputs.cache-hit != 'true'
-      run: ./.github/depends/zlib.sh -b both -p $HOME/zlib-prefix
-
-    - name: Build and test
-      shell: bash
-      run: |
-        # default configuration - overwrite its params later depending on matrix.pattern
-        export MSGPACK_CXX_VERSION="MSGPACK_CXX20=ON"
-        export ARCH=64
-        export API_VERSION=3
-        export CHAR_SIGN="signed"
-        export X3_PARSE="OFF"
-        export SANITIZE="-fsanitize=undefined -fno-sanitize-recover=all"
-        export ACTION="ci/build_cmake.sh"
-
-        case ${{ matrix.pattern }} in
-          0)
-            export CXX="clang++-10"
-            export MSGPACK_CXX_VERSION="MSGPACK_CXX11=OFF"
-            ;;
-          1)
-            export CXX="g++-10"
-            export MSGPACK_CXX_VERSION="MSGPACK_CXX11=ON"
-            ;;
-          2)
-            export CXX="clang++-10"
-            export MSGPACK_CXX_VERSION="MSGPACK_CXX14=ON"
-            ;;
-          3)
-            export CXX="g++-10"
-            export MSGPACK_CXX_VERSION="MSGPACK_CXX17=ON"
-            ;;
-          4)
-            export CXX="clang++-10"
-            export MSGPACK_CXX_VERSION="MSGPACK_CXX20=ON"
-            export NO_BOOST="-DMSGPACK_NO_BOOST"
-            ;;
-          5)
-            export CXX="g++-10"
-            export ARCH=32
-            ;;
-          6)
-            export CXX="clang++-10"
-            export API_VERSION=2
-            ;;
-          7)
-            export CXX="g++-10"
-            export API_VERSION=1
-            ;;
-          8)
-            export CXX="clang++-10"
-            export CHAR_SIGN="unsigned"
-            ;;
-          9)
-            export CXX="g++-10"
-            export X3_PARSE="ON"
-            ;;
-          10)
-            export CXX="clang++-10"
-            export ACTION="ci/build_regression.sh"
-            ;;
-          11)
-            export CXX="g++-10"
-            export ARCH=32
-            export CHAR_SIGN="unsigned"
-            export X3_PARSE="ON"
-            ;;
-        esac
-
-        # build and test
-        CMAKE_CXX_COMPILER="$CXX" CXXFLAGS="-Werror -g ${SANITIZE} ${NO_BOOST}" ci/build_cmake.sh || exit 1
-        cat Files.cmake| grep ".*\.[h|hpp]" | perl -pe 's/ //g' | sort > tmp1  && find include -name "*.h" -o -name "*.hpp" | sort > tmp2 && diff tmp1 tmp2
-
-  windows:
-    name: ${{ format('Windows cxx{0}', matrix.cxx) }}
-    runs-on: windows-2019
-    strategy:
-      fail-fast: false
-      matrix:
-        # MSVC2019 only supports /std:c++14, /std:c++17 and /std:c++latest
-        cxx: [14, 17, 20]
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Cache vcpkg dependencies
-      id: cache-vcpkg
-      uses: actions/cache@v2
-      with:
-        path: C:/vcpkg/installed/x64-windows
-        key: ${{ runner.os }}-vcpkg-2021-08-09
-
-    - name: Install vcpkg dependencies
-      if: steps.cache-vcpkg.outputs.cache-hit != 'true'
-      shell: powershell
-      run: |
-        vcpkg update
-        vcpkg install zlib:x64-windows
-        vcpkg install boost-assert:x64-windows boost-numeric-conversion:x64-windows boost-variant:x64-windows boost-utility:x64-windows boost-fusion:x64-windows boost-optional:x64-windows boost-predef:x64-windows boost-preprocessor:x64-windows boost-timer:x64-windows boost-test:x64-windows
-
-    - name: Build and test
-      shell: powershell
-      run: |
-        $CPPVER="MSGPACK_CXX${{ matrix.cxx }}=ON"
-
-        md build
-        cmake `
-            -A x64 `
-            -G "Visual Studio 16 2019" `
-            -D CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" `
-            -D MSGPACK_BUILD_TESTS=ON `
-            -D $CPPVER `
-            -D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING /D_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING /D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING /W3 /WX" `
-            -B build `
-            -S .
-        if ($LastExitCode -ne 0) { exit $LastExitCode }
-
-        cmake --build build --config Release
-        if ($LastExitCode -ne 0) { exit $LastExitCode }
-
-        ctest -VV --test-dir build -C Release
-        if ($LastExitCode -ne 0) { exit $LastExitCode }
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,34 @@
+language: cpp
+cache:
+  - apt
+compiler:
+  - clang
+  - gcc
+before_install:
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - sudo add-apt-repository -y ppa:h-rayflood/llvm
+  - sudo apt-get update -qq
+  - sudo apt-get update
+  - sudo apt-get install valgrind
+install:
+  - sudo apt-get install -qq gcc-4.8-multilib g++-4.8-multilib
+  - sudo apt-get install --allow-unauthenticated -qq clang-3.4
+  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
+  - sudo apt-get install -y lib32gcc1
+  - sudo apt-get install -y libc6-i386
+  - sudo apt-get install -y lib32z1-dev
+  - sudo apt-get install -y lib32stdc++6
+  - wget https://googletest.googlecode.com/files/gtest-1.7.0.zip
+  - unzip gtest-1.7.0.zip && cd gtest-1.7.0 && sudo cp -r include/gtest /usr/local/include && g++ src/gtest-all.cc -I. -Iinclude -c && g++ src/gtest_main.cc -I. -Iinclude -c && ar -rv libgtest.a gtest-all.o && ar -rv libgtest_main.a gtest_main.o && sudo mv *.a /usr/local/lib && g++ -m32 src/gtest-all.cc -I. -Iinclude -c && g++ -m32 src/gtest_main.cc -I. -Iinclude -c && ar -rv libgtest.a gtest-all.o && ar -rv libgtest_main.a gtest_main.o && sudo mkdir /usr/local/lib32 && sudo mv *.a /usr/local/lib32 && cd ..
+env:
+  - ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib"
+  - ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32"
+  - ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib"
+  - ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32"
+  - ACTION="ci/build_cmake.sh"     VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib"
+  - ACTION="ci/build_cmake.sh"     VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32"
+  - ACTION="ci/build_cmake.sh"     VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib"
+  - ACTION="ci/build_cmake.sh"     VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32"
+
+script:
+  - git clean -xdf && CMAKE_LIBRARY_PATH=${LIBPATH} ${ACTION} ${VERSION} ${ARCH}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,366 +1,10 @@
-# 2022-09-07 version 4.1.2 for C++
-  * Fix noexcept on zone (#1030)
-  * Improve cmake support (#1028, #1032)
-  * Improve CI (#1023)
-  * Improve supporting platform (#1021)
-  * Refine double/float packing (#1018)
-  * Refine include files dependency (#1011)
-
-# 2022-03-09 version 4.1.1 for C++
-  * Remove chrono support on `MSGPACK_NO_BOOST` to fix  compile error.
-  * Improve build system (#1003)
-
-# 2022-02-12 version 4.1.0 for C++
-  * Add experimental support for no boost dependency (#1001)
-    * For cmake, add `-DMSGPACK_USE_BOOST=OFF`. For C++ compiler add `-DMSGPACK_NO_BOOST`.
-  * Improve BIN console output (#995)
-  * Fix include notation (#991)
-
-# 2021-10-23 version 4.0.3 for C++
-  * Remove Enabler2 template parameter from object adaptor (#987)
-  * Add MSGPACK_BUILD_DOCS cmake option (#983, #984)
-
-# 2021-08-31 version 4.0.2 for C++
-  * Fix fuzzer interface function name (#972)
-  * Fix boost test link error and support both dynamin(default) and static link boost (#971)
-
-# 2021-08-30 version 4.0.1 for C++
-  * Fix release tarball and its generation script (#967)
-
-# 2021-08-29 version 4.0.0 for C++
-  * Improve zone alignment logic (#965)
-  * Fix v1 unpack logic for STR and BIN (#957, #951)
-  * Fix UB on memcmp with size 0 (#954)
-  * Fix `iovec` name conflict (#952)
-  * Add `std::array<std::byte>` `std::span<char>` `std::span<unsigned char>` `std::span<std::byte>` adaptors (#951)
-  * Improve documents (#918, #919, #951)
-  * Improve tests (#916)
-  * Introduce BOOST_ASSERT (#898)
-  * Improve build system (#897, #905, #924, #951)
-  * Improve Boost.Fusion support (#894)
-  * Check nullptr before call memcpy (#891)
-  * Refine and bugfix `std::chrono::time_point` adaptor (#888, #893)
-  * Improve CI (#884, #892, #895, #951, #955)
-## << breaking changes >>
-  * Separate C++ part of the msgpack-c  from C/C++ mixed msgpack-c (#876, #878)
-  * Require boost libraries. See README.md Dependency(#912)
-
-# 2020-06-05 version 3.3.0
-  * Add json example for C (#870)
-  * Add both header and body packing functions for C (#870)
-  * Set default ref_size and chunk_size to vrefbuffer (#865)
-  * Add examples (#861)
-  * Improve build system (#839, #842)
-  * Improve tests (#829)
-  * Improve documents (#828)
-  * Remove some warnings (#827, #851, #871)
-  * Improve CI environment (#824, #831, #833, #834, #846, #860, 874)
-
-# 2019-12-10 version 3.2.1
-  * Fix snprintf return value checking (#821)
-  * Remove some warnings (#819)
-  * Fix fbuffer result checking (#812)
-  * Fix temporary object handling (#807)
-  * Improve cmake support (#804)
-  * Fix invalid `int main` parameter (#800)
-  * Improve supporting platform (#797, #817)
-  * Fix ZLIB error handling (#795)
-  * Remove unused variable (#793)
-  * Improve integer overflow checking (#792)
-
-# 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)
-  * Improve cross platform configuration (#601)
-  * Remove some warnings (#599, #602, #605)
-
-# 2017-06-07 version 2.1.2
-
-* Improve documents (#565)
-  * Fix empty map parse bug (#568)
-  * Improve build system (#569, #570, #572, #579, #591, #592)
-  * Remove some warnings (#574, #578, #586, #588)
-  * Improve cross platform configuration (#577, #582)
-  * Add cmake package config support (#580)
-  * Fix streaming unpack bug (#585)
-
-# 2017-02-04 version 2.1.1
-
-  * Fix unpacker's buffer management bug (#561)
-  * Add boost string_view adaptor (#558)
-  * Remove some warnings (#557, #559)
-  * Improve coding style (#556)
-
-# 2017-01-10 version 2.1.0
-
-## << breaking changes >>
-
-  * Fix object internal data type is float if msgpack format is float32 (#531)
-
-## << recommended changes >>
-
-  * Add `FLOAT64` type. Please use it instead of `DOUBLE` (#531)
-  * Add `FLOAT32` type. Please use it instead of `FLOAT` (#531)
-
-## << other updates >>
-
-  * Add iterator based parse/unpack function(experimental) (#553)
-  * Add `[[deprecated]]` attribute for C++14 (#552)
-  * Fix `msgpack_unpack()` return code (#548)
-  * Fix integer overflow (#547, #549, #550)
-  * Add example codes (#542)
-  * Add MSGPACK_NVP. You can use not only variable name but also any strings (#535)
-  * Fix and Improve build system (#532, #545)
-  * Fix `gcc_atomic.hpp` include path (#529, #530)
-  * Improve CI environment (#526)
-  * Improve documents (#524)
-  * Add msgpack_unpacker_next_with_size() function (#515)
-  * Fix `as()` applying condition (#511)
-  * Fix fbuffer write (#504)
-  * Add gcc bug workaround (#499)
-  * Improve object print (#497, #500, #505, #533)
-  * Remove some warnings (#495, #506, #508, #513, #528, #538, #545)
-
-# 2016-06-25 version 2.0.0
-
-## << breaking changes >>
-
-  * Removed autotools support. Use cmake instead (#476, #479)
-  * Removed pointer version of msgpack::unpack APIs. Use reference version instead (#453)
-  * Removed MSGPACK_DISABLE_LEGACY_CONVERT. msgpack::object::convert(T*) is removed by default. Use msgpack::object::convert(T&) instead (#451)
-  * Removed msgpacl::type::nil. Use nil_t or define MSGPACK_USE_LECACY_NIL (#444)
-  * Removed std::string to msgpack::object conversion (#434)
-
-## << recommended changes >>
-
-  * Replaced msgpack::unpacked with msgpack::object_handle. msgpack::unpacked is kept as a typedef of msgpack::object_handle. (#448)
-
-## << other updates >>
-
-  * Add strict size checking adaptor. Relaxed tuple conversion (#489)
-  * Fix and Improve example codes (#487)
-  * Add C++/CLI support for nullptr (#481)
-  * Update the boost libraries that are contained by msgpack-c (#475)
-  * Fix gcc_atomic.hpp location (#474)
-  * Add C-Style array support (#466, #488)
-  * Fix include file dependency (#464)
-  * Add a visitor version of unpack API (#461)
-  * Fix JSON string conversion from "nil" to "null" (#458)
-  * Fix and Improve build system (#455, #471, #473, #486, #491)
-  * Fix comments (#452)
-  * Fix unintentional msgpack::zone moving problem (#447)
-  * Fix operator>> and << for msgpack::object (#443)
-  * Fix C++03 msgpack::zone::clear() memory access violation bug (#441)
-  * Fix TARGET_OS_IPHONE checking (#436)
-  * Fix invalid front() call for empty container (#435)
-  * Fix compile error on g++6 (C++11 only) (#426, #430)
-  * Fix zone size expansion logic (#423)
-  * Fix wrong hader file dependency (#421)
-  * Fix msvc specific problem (#420)
-  * Add v2 API support (#415)
-
-# 2016-01-22 version 1.4.0
-
-## << recommended changes >>
-
-  * Define [MSGPACK_DISABLE_LEGACY_NIL](https://github.com/msgpack/msgpack-c/wiki/v1_1_cpp_configure#msgpack_disable_legacy_nil-since-140), then `msgpack::type::nil` is replaced by with `msgpack::type::nil_t` (#408, #411, #412).
-    Replace `msgpack::type::nil` with `msgpack::type::nil_t` in client codes.
-    `msgpack::type::nil` will be removed on the version 2.0.0.
-  * Define [MSGPACK_DISABLE_LEGACY_CONVERT](https://github.com/msgpack/msgpack-c/wiki/v1_1_cpp_configure#msgpack_disable_legacy_convert-since-140), then `msgpack::object::convert(T*)` is removed (#410).
-    Replace calling `msgpack::bojectconvert(T*)` with `msgpack::bojectconvert(T&)` in client codes as follows:
-
-    ```C++
-     int i;
-     obj.convert(&i); // before
-     ```
-
-    ```C++
-     int i;
-     obj.convert(i);  // after
-     ```
-
-    `msgpack::object::convert(T*)` will be removed on the version 2.0.0.
-
-Define the macros above as follows when you compile C++ codes that use msgpack-c:
-
-```
-g++ -Ipath_to_msgpack/include -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT your_code.cpp
-
-```
-
-You can compile existing codes without defining macros above but I recommend defining them and updating your codes to fix the issues #408, #411, #412, #399, and #410. It is also a good preparation for the version 2.0.0.
-
-## << other updates >>
-
-  * Improve documents (#387, #407)
-  * Remove C++ version library (#394, #402)
-  * Add Doxyfile and ChangeLog to the distribution package (#397)
-  * Add signed/unsigned char test to travis-ci (#398)
-  * Remove some warnings (#400, #401, #409)
-  * Fix endian checking. (#404)
-
-# 2015-11-21 version 1.3.0
-
-  * Change the license from the Apache License Version 2.0 to the
-    Boost Software License, Version 1.0.(#386)
-  * Remove some warnings (#365)
-  * Add std::reference_wrapper support(#373, #384)
-  * Improve tests (#375, #378, #379, #380)
-  * Fix msvc specific problem (#376, #383)
-  * Fix typos (#381)
-
-# 2015-09-04 version 1.2.0
-
-## << breaking changes >>
-
-  * Change std::vector<unsigned char> and std::array<unsigned char>
-    mapped to BIN instead of ARRAY (#243)
-  * Remove redundant copy (#285)
-
-
-## << other updates >>
-
-  * Add array_ref to map to ARRAY (#243)
-  * Add variant type and adaptor (#349)
-  * Add object::convert_if_not_nil() (#357)
-  * Fix invalid offset update (#354)
-  * Add C++11 support on MSVC2015(#339, #347)
-  * Fix and Improve build system (#346, #350, #361, #363)
-  * Import Boost.Preprocessor as a part of msgpack-c (#312)
-  * Fix OSX with libc++ specific errors (#334, #362)
-  * Add customized containers support (#330)
-  * Add std::unique_ptr and std::shared_ptr support (#329)
-  * Add missing install files (#328)
-  * Add shared/static library switching option (#316)
-  * Improve no throw description on C++11 (#313)
-  * Import Boost.Predef as a part of msgpack-c (#312)
-  * Add map based serialize support (#306)
-  * Add Boost.Fusion support (#305)
-  * Add v4 format RAW support (#304)
-  * Fix zbuffer with empty string problem (#303)
-  * Add non default constructible class support (#302, #324, #327, #331, #332, #345)
-  * Add inline keyword to function (template) (#299)
-  * Add EXT type supporting classes (#292, #308)
-  * Fix raw_ref != comparison (#290)
-  * Add object deep copy (#288)
-  * Remove some warnings (#284, #322, #323, #335)
-  * Improve compiler version checking (#283)
-  * Add return value to object::convert() (#282)
-  * Improve move semantic support in C++11 (#279, #353)
-  * Add Boost.StringRef support (#278)
-  * Improve CI environment (#276, #294, #338)
-  * Add converting to JSON (#274, #301)
-  * Fix iOS specific problem (#270)
-  * Improve doxtgen document generation (#269)
-  * Add Boost.Optional support (#268)
-  * Fix msvc specific problem (#267, #295)
-  * Add base class serialization. (#265, #277)
-  * Add and improve examples. (#264, #310, #311, #341, #342, #344)
-  * Fix wiki URL. (#263)
-
-# 2015-04-03 version 1.1.0
-
-## << breaking changes >>
-
-  * Remove msgpack_fwd.hpp
-  * Improve user types adaptation mechanism (#262)
-    Since version 1.0.0, users need to obey the correct include order.
-    However, it is very difficult to maintain the correct order in big
-    projects. version 1.1.0 removed this order. Users don't need to
-    care about include order. Migration guide from 1.0.x to 1.1.0 has
-    been written. See https://github.com/msgpack/msgpack-c/wiki
-
-
-## << other updates >>
-
-  * Fix vector<bool> size check (#251)
-  * Fix inttypes.h inclusion on MSVC (#257)
-  * Support documents generation by Doxygen (#259)
-  * Remove C99 style variable declaration (#253)
-  * Improve documents (https://github.com/msgpack/msgpack-c/wiki)
-
-# 2015-03-22 version 1.0.1:
-
+2015-3-22 version 1.0.1:
  * Fix compilation error on Mac 10.9 (#244)
  * Fix typos in documents (#240)
  * Update CHANGELOG.md for version 1.0.0 (#242)
  * Fix erb templates for the next code generation (#239)

-# 2015-03-10 version 1.0.0:
-
+2015-03-10 version 1.0.0:
  * Support msgpack v5 format (str, bin, and ext) https://github.com/msgpack/msgpack/blob/master/spec.md (#142)
  * Support std::tuple, std::forward_list, std::array, std::unordered_set, std::unordered_map on C++11. tr1 unordered containers are still supported (#53, #130, #137, #154, #169)
  * Update msgpack-c as a header-only library on C++ (#142)
@@ -386,7 +30,7 @@ You can compile existing codes without defining macros above but I recommend def
  * Improve documents (https://github.com/msgpack/msgpack-c/wiki)
  * Other bug fixes and refactoring: #62, #91, #95, #97, #107, #109, #113, #117, #119, #121, #122, #123, #126, #131, #136, #138, #140, #143, #145, #146, #150, #151, #152, #156, #157, #158, #161, #165, #170, #172, #179, #180, #181, #182, #183, #192, #195, #199, #200, #207, #211, #212, #219, #222, #224, #230, #231, #232, #233, #234, #235

-# 2014-07-02 version 0.5.9:
+2014-07-02 version 0.5.9:

  * Support std::tr1 unordered containers by default (#51, #63, #68, #69)
  * Remove some warnings (#56)
@@ -400,7 +44,7 @@ You can compile existing codes without defining macros above but I recommend def
  * Add FILE* buffer (#40)
  * Other bug fixes and refactoring: #39, #73, #77, #79, #80, #81, #84, #90

-# 2013-12-23 version 0.5.8:
+2013-12-23 version 0.5.8:

  * Move to the new github repository msgpack/msgpack-c
  * Support the new deserialization specification
@@ -408,38 +52,38 @@ You can compile existing codes without defining macros above but I recommend def
  * Other bug fixes and refactoring: #46, #41, #36, #35, #33, #32, #30, #29, #28, #27, #26, #25, #8, #3
  * Update of documents: #23, #18, #17

-# 2011-08-08 version 0.5.7:
+2011-08-08 version 0.5.7:

  * fixes compile error problem with llvm-gcc and Mac OS X Lion

-# 2011-04-24 version 0.5.6:
+2011-04-24 version 0.5.6:

  * #42 fixes double-free problem on msgpack_unpacker_release_zone

-# 2011-02-24 version 0.5.5:
+2011-02-24 version 0.5.5:

  * eliminates dependency of winsock2.h header
  * fixes msgpack_vc.postbuild.bat file
  * fixes some implicit cast warnings

-# 2010-08-29 version 0.5.4:
+2010-08-29 version 0.5.4:

  * includes msgpack_vc2008.vcproj file in source package
  * fixes type::fix_int types

-# 2010-08-27 version 0.5.3:
+2010-08-27 version 0.5.3:

  * adds type::fix_{u,}int{8,16,32,64} types
  * adds msgpack_pack_fix_{u,}int{8,16,32,64} functions
  * adds packer<Stream>::pack_fix_{u,}int{8,16,32,64} functions
  * fixes include paths

-# 2010-07-14 version 0.5.2:
+2010-07-14 version 0.5.2:

  * type::raw::str(), operator==, operator!=, operator< and operator> are now const
  * generates version.h using AC_OUTPUT macro in ./configure

-# 2010-07-06 version 0.5.1:
+2010-07-06 version 0.5.1:

  * Add msgpack_vrefbuffer_new and msgpack_vrefbuffer_free
  * Add msgpack_sbuffer_new and msgpack_sbuffer_free
@@ -449,7 +93,7 @@ You can compile existing codes without defining macros above but I recommend def
  * Add msgpack_version{,_major,_minor} functions to check library version
  * ./configure supports --disable-cxx option not to build C++ API

-# 2010-04-29 version 0.5.0:
+2010-04-29 version 0.5.0:

  * msgpack_object_type is changed. MSGPACK_OBJECT_NIL is now 0x00.
  * New safe streaming deserializer API.
@@ -457,3 +101,4 @@ You can compile existing codes without defining macros above but I recommend def
  * Add operator==(object, const T&)
  * MSGPACK_DEFINE macro defines msgpack_object(object* obj, zone* z)
  * C++ programs doesn't need to link "msgpackc" library.
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,7 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 3.1 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.6)
+PROJECT (msgpack)

-CMAKE_POLICY (SET CMP0054 NEW)
-
-PROJECT (msgpack LANGUAGES CXX)
-
-ADD_LIBRARY (msgpackc-cxx INTERFACE)
-
-FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.hpp contents)
+FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.h contents)
 STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents})
 SET (VERSION_MAJOR ${CMAKE_MATCH_1})
 STRING (REGEX MATCH "#define MSGPACK_VERSION_MINOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents})
@@ -15,87 +10,47 @@ STRING (REGEX MATCH "#define MSGPACK_VERSION_REVISION *([0-9a-zA-Z_]*)" NULL_OUT
 SET (VERSION_REVISION ${CMAKE_MATCH_1})
 SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION})

-LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
-SET (GNUCXX_STD_SUPPORT_VERSION "4.3")
+SET (prefix ${CMAKE_INSTALL_PREFIX})
+SET (exec_prefix "\${prefix}")
+SET (libdir "\${exec_prefix}/lib")
+SET (includedir "\${prefix}/include")

 OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF)
-OPTION (MSGPACK_CXX14 "Using c++14 compiler" OFF)
-OPTION (MSGPACK_CXX17 "Using c++17 compiler" OFF)
-OPTION (MSGPACK_CXX20 "Using c++20 compiler" OFF)
+OPTION (MSGPACK_32BIT "32bit compile" OFF)

-OPTION (MSGPACK_32BIT            "32bit compile"                        OFF)
-OPTION (MSGPACK_USE_BOOST        "Use Boost libraried"                  ON)
-OPTION (MSGPACK_USE_X3_PARSE     "Use Boost X3 parse"                   OFF)
-OPTION (MSGPACK_BUILD_TESTS      "Build tests"                          OFF)
-OPTION (MSGPACK_BUILD_DOCS       "Build Doxygen documentation"          ON)
-OPTION (MSGPACK_FUZZ_REGRESSION  "Enable regression testing"            OFF)
-OPTION (MSGPACK_BUILD_EXAMPLES   "Build msgpack examples"               OFF)
-OPTION (MSGPACK_GEN_COVERAGE     "Generate coverage report"             OFF)
-OPTION (MSGPACK_USE_STATIC_BOOST "Statically link with boost libraries" OFF)
-OPTION (MSGPACK_CHAR_SIGN        "Char sign to use (signed or unsigned)")
-
-SET (CMAKE_CXX_STANDARD_REQUIRED ON)
-
-IF (MSGPACK_USE_X3_PARSE)
-    IF (NOT (MSGPACK_CXX14 OR MSGPACK_CXX17 OR MSGPACK_CXX20))
-        MESSAGE (FATAL_ERROR "MSGPACK_USE_X3_PARSE requires MSGPACK_CXX14 or newer")
-    ENDIF ()
-    SET (CMAKE_CXX_FLAGS "-DMSGPACK_USE_X3_PARSE ${CMAKE_CXX_FLAGS}")
-ENDIF ()
-
-IF (MSGPACK_CXX20)
-    SET (CMAKE_CXX_STANDARD 20)
-ELSEIF (MSGPACK_CXX17)
-    SET (CMAKE_CXX_STANDARD 17)
-ELSEIF (MSGPACK_CXX14)
-    SET (CMAKE_CXX_STANDARD 14)
-ELSEIF (MSGPACK_CXX11)
-    SET (CMAKE_CXX_STANDARD 11)
-ELSE ()
-    SET (CMAKE_CXX_STANDARD 98)
+IF (MSGPACK_CXX11)
+   IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+      SET (CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+   ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+      SET (CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+   ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+      MESSAGE ( FATAL_ERROR "MSVC doesn't support C++11 yet.")
+   ENDIF ()
 ENDIF ()

 IF (MSGPACK_32BIT)
-    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -m32)
-        TARGET_LINK_OPTIONS(msgpackc-cxx INTERFACE -m32)
-    ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-        TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -m32)
-        TARGET_LINK_OPTIONS(msgpackc-cxx INTERFACE -m32)
-    ENDIF ()
+   IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+      SET (CMAKE_CXX_FLAGS "-m32 ${CMAKE_CXX_FLAGS}")
+      SET (CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}")
+      SET (CMAKE_EXE_LINKER_FLAGS "-m32 ${CMAKE_EXE_LINKER_FLAGS}")
+   ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+      SET (CMAKE_CXX_FLAGS "-m32 ${CMAKE_CXX_FLAGS}")
+      SET (CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}")
+      SET (CMAKE_EXE_LINKER_FLAGS "-m32 ${CMAKE_EXE_LINKER_FLAGS}")
+   ENDIF ()
 ENDIF ()

-IF (MSGPACK_USE_BOOST)
-    SET (Boost_USE_MULTITHREADED ON)
-
-    IF (MSGPACK_USE_STATIC_BOOST)
-        MESSAGE (STATUS "Staticly linking with Boost")
-        SET (Boost_USE_STATIC_LIBS TRUE)
-    ELSE ()
-        MESSAGE (STATUS "Dynamically linking with Boost")
-        SET (Boost_USE_STATIC_LIBS FALSE)
-    ENDIF ()
-
-    FIND_PACKAGE (Boost REQUIRED)
-ELSE ()
-    TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_NO_BOOST)
+FIND_PACKAGE (GTest)
+FIND_PACKAGE (ZLIB)
+FIND_PACKAGE (Threads)
+IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND)
+    OPTION (MSGPACK_BUILD_TESTS "Build msgpack tests." ON)
 ENDIF ()

-IF (MSGPACK_CHAR_SIGN)
-    TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -f${MSGPACK_CHAR_SIGN}-char)
-ENDIF ()
+OPTION (MSGPACK_ENABLE_CXX "Enable C++ interface." ON)

-IF (MSGPACK_DEFAULT_API_VERSION)
-    TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION})
-ELSE ()
-    SET (MSGPACK_DEFAULT_API_VERSION 3)
-    TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=3)
-ENDIF ()
-
-IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.1)
-        INCLUDE (CheckCXXSourceCompiles)
-        CHECK_CXX_SOURCE_COMPILES ("
+INCLUDE (CheckCXXSourceCompiles)
+CHECK_CXX_SOURCE_COMPILES ("
 #include <bits/atomicity.h>
 int atomic_sub(int i) { return __gnu_cxx::__exchange_and_add(&i, -1) - 1; }
 int atomic_add(int i) { return __gnu_cxx::__exchange_and_add(&i, 1) + 1; }
@@ -104,143 +59,207 @@ int main(int argc, char * argv[])
    atomic_sub(1);
    atomic_add(1);
 }
-"
-        MSGPACK_ENABLE_GCC_CXX_ATOMIC)
-    ENDIF ()
+" MSGPACK_ENABLE_GCC_CXX_ATOMIC)
+
+IF (MSGPACK_ENABLE_GCC_CXX_ATOMIC)
+    LIST (APPEND msgpack_SOURCES
+        src/gcc_atomic.cpp
+    )
 ENDIF ()


-INCLUDE (Files.cmake)
-
-TARGET_INCLUDE_DIRECTORIES (msgpackc-cxx
-    INTERFACE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-        $<INSTALL_INTERFACE:include>
+LIST (APPEND msgpack_SOURCES
+    src/unpack.c
+    src/objectc.c
+    src/version.c
+    src/vrefbuffer.c
+    src/zone.c
 )

-IF (MSGPACK_USE_BOOST)
-    TARGET_LINK_LIBRARIES (msgpackc-cxx INTERFACE Boost::boost)
+LIST (APPEND msgpack_HEADERS
+    include/msgpack/pack_define.h
+    include/msgpack/pack_template.h
+    include/msgpack/unpack_define.h
+    include/msgpack/unpack_template.h
+    include/msgpack/util.h
+    include/msgpack/sysdep.h
+    include/msgpack/gcc_atomic.h
+    include/msgpack/sbuffer.h
+    include/msgpack/version.h
+    include/msgpack/vrefbuffer.h
+    include/msgpack/zbuffer.h
+    include/msgpack/fbuffer.h
+    include/msgpack/pack.h
+    include/msgpack/unpack.h
+    include/msgpack/object.h
+    include/msgpack/zone.h
+)
+
+IF (MSGPACK_ENABLE_CXX)
+    LIST (APPEND msgpack_HEADERS
+        include/msgpack.hpp
+        include/msgpack_fwd.hpp
+        include/msgpack/adaptor/bool.hpp
+        include/msgpack/adaptor/bool_fwd.hpp
+        include/msgpack/adaptor/char_ptr.hpp
+        include/msgpack/adaptor/char_ptr_fwd.hpp
+        include/msgpack/adaptor/check_container_size.hpp
+        include/msgpack/adaptor/cpp11/array.hpp
+        include/msgpack/adaptor/cpp11/array_fwd.hpp
+        include/msgpack/adaptor/cpp11/array_char.hpp
+        include/msgpack/adaptor/cpp11/array_char_fwd.hpp
+        include/msgpack/adaptor/cpp11/forward_list.hpp
+        include/msgpack/adaptor/cpp11/forward_list_fwd.hpp
+        include/msgpack/adaptor/cpp11/tuple.hpp
+        include/msgpack/adaptor/cpp11/tuple_fwd.hpp
+        include/msgpack/adaptor/cpp11/unordered_map.hpp
+        include/msgpack/adaptor/cpp11/unordered_map_fwd.hpp
+        include/msgpack/adaptor/cpp11/unordered_set.hpp
+        include/msgpack/adaptor/cpp11/unordered_set_fwd.hpp
+        include/msgpack/adaptor/define.hpp
+        include/msgpack/adaptor/deque.hpp
+        include/msgpack/adaptor/deque_fwd.hpp
+        include/msgpack/adaptor/detail/cpp03_define.hpp
+        include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp
+        include/msgpack/adaptor/detail/cpp03_msgpack_tuple_fwd.hpp
+        include/msgpack/adaptor/detail/cpp11_define.hpp
+        include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
+        include/msgpack/adaptor/detail/cpp11_msgpack_tuple_fwd.hpp
+        include/msgpack/adaptor/fixint.hpp
+        include/msgpack/adaptor/fixint_fwd.hpp
+        include/msgpack/adaptor/float.hpp
+        include/msgpack/adaptor/float_fwd.hpp
+        include/msgpack/adaptor/int.hpp
+        include/msgpack/adaptor/int_fwd.hpp
+        include/msgpack/adaptor/list.hpp
+        include/msgpack/adaptor/list_fwd.hpp
+        include/msgpack/adaptor/map.hpp
+        include/msgpack/adaptor/map_fwd.hpp
+        include/msgpack/adaptor/msgpack_tuple.hpp
+        include/msgpack/adaptor/msgpack_tuple_fwd.hpp
+        include/msgpack/adaptor/nil.hpp
+        include/msgpack/adaptor/nil_fwd.hpp
+        include/msgpack/adaptor/pair.hpp
+        include/msgpack/adaptor/pair_fwd.hpp
+        include/msgpack/adaptor/raw.hpp
+        include/msgpack/adaptor/raw_fwd.hpp
+        include/msgpack/adaptor/set.hpp
+        include/msgpack/adaptor/set_fwd.hpp
+        include/msgpack/adaptor/string.hpp
+        include/msgpack/adaptor/string_fwd.hpp
+        include/msgpack/adaptor/tr1/unordered_map.hpp
+        include/msgpack/adaptor/tr1/unordered_map_fwd.hpp
+        include/msgpack/adaptor/tr1/unordered_set.hpp
+        include/msgpack/adaptor/tr1/unordered_set_fwd.hpp
+        include/msgpack/adaptor/vector.hpp
+        include/msgpack/adaptor/vector_fwd.hpp
+        include/msgpack/adaptor/vector_bool.hpp
+        include/msgpack/adaptor/vector_bool_fwd.hpp
+        include/msgpack/adaptor/vector_char.hpp
+        include/msgpack/adaptor/vector_char_fwd.hpp
+        include/msgpack/cpp_config.hpp
+        include/msgpack/detail/cpp03_zone.hpp
+        include/msgpack/detail/cpp11_zone.hpp
+        include/msgpack/fbuffer.hpp
+        include/msgpack/object.hpp
+        include/msgpack/object_fwd.hpp
+        include/msgpack/pack.hpp
+        include/msgpack/sbuffer.hpp
+        include/msgpack/type.hpp
+        include/msgpack/unpack.hpp
+        include/msgpack/version.hpp
+        include/msgpack/versioning.hpp
+        include/msgpack/vrefbuffer.hpp
+        include/msgpack/zbuffer.hpp
+        include/msgpack/zone.hpp
+    )
 ENDIF ()

-IF (MSGPACK_GEN_COVERAGE)
-    IF (NOT MSGPACK_BUILD_TESTS)
-        MESSAGE(FATAL_ERROR "Coverage requires -DMSGPACK_BUILD_TESTS=ON")
-    ENDIF ()
-    STRING (TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_CMAKE_BUILD_TYPE)
-    IF (NOT "${UPPER_CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
-        MESSAGE (FATAL_ERROR "Coverage requires -DCMAKE_BUILD_TYPE=Debug")
-    ENDIF ()
+EXECUTE_PROCESS (
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src/msgpack
+)

-    INCLUDE (CodeCoverage)
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS}")
-    SETUP_TARGET_FOR_COVERAGE(coverage make coverage test)
-ENDIF ()
+CONFIGURE_FILE (
+    msgpack.pc.in
+    msgpack.pc
+    @ONLY
+)
+
+INCLUDE_DIRECTORIES (
+    ./
+    include/
+    ${CMAKE_CURRENT_BINARY_DIR}/include/
+)
+
+ADD_LIBRARY (msgpack SHARED
+    ${msgpack_SOURCES}
+    ${msgpack_HEADERS}
+)
+
+ADD_LIBRARY (msgpack-static STATIC
+    ${msgpack_SOURCES}
+    ${msgpack_HEADERS}
+)
+
+SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack")
+SET_TARGET_PROPERTIES (msgpack PROPERTIES IMPORT_SUFFIX "_import.lib")
+SET_TARGET_PROPERTIES (msgpack PROPERTIES SOVERSION 3 VERSION 4.0.0)

 IF (MSGPACK_BUILD_TESTS)
-    IF (NOT MSGPACK_USE_BOOST)
-        MESSAGE(FATAL_ERROR "Test requires -DMSGPACK_USE_BOOST=ON")
-    ENDIF ()
    ENABLE_TESTING ()
-    # MEMORYCHECK_COMMAND_OPTIONS needs to place prior to CTEST_MEMORYCHECK_COMMAND
-    SET (MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-leak-kinds=definite,possible --error-exitcode=1")
-    FIND_PROGRAM (CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
-    INCLUDE (Dart)
+    SET(CTEST_MEMORYCHECK_COMMAND "/usr/bin/valgrind")
+    INCLUDE(Dart)
+    SET(MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --error-exitcode=1")
    ADD_SUBDIRECTORY (test)
 ENDIF ()

-# enable regression testing
-IF (MSGPACK_FUZZ_REGRESSION)
-    ENABLE_TESTING ()
-    ADD_SUBDIRECTORY (fuzz)
+IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3 -DPIC")
+    SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3" )
 ENDIF ()
-
-IF ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "sparc")
-    TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_ZONE_ALIGN=8)
-ENDIF ()
-
-IF (MSGPACK_BUILD_EXAMPLES)
-    ADD_SUBDIRECTORY (example)
-ENDIF ()
-
-# Doxygen
-IF (MSGPACK_BUILD_DOCS)
-    FIND_PACKAGE (Doxygen)
-    IF (DOXYGEN_FOUND)
-        LIST (APPEND Doxyfile_cpp_CONTENT
-            COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
-            COMMAND ${CMAKE_COMMAND} -E echo "FILE_PATTERNS      = *.hpp" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
-            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
-                COMMAND ${CMAKE_COMMAND} -E echo "HAVE_DOT       = YES" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
-            )
-        ENDIF ()
-        ADD_CUSTOM_TARGET (
-            doxygen
-            ${Doxyfile_cpp_CONTENT}
-            COMMAND ${CMAKE_COMMAND} -E echo "PROJECT_NAME       = \"MessagePack for C++\"" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
-            COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
-            VERBATIM
-        )
+IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+        STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    ELSE ()
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
    ENDIF ()
 ENDIF ()

-include (GNUInstallDirs)
+IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC90" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC10")
+    SET_SOURCE_FILES_PROPERTIES(${msgpack_SOURCES} PROPERTIES LANGUAGE CXX)
+ENDIF()

-# Install library.
-INSTALL (TARGETS msgpackc-cxx
-         EXPORT msgpackc-cxx-targets
-         COMPONENT msgpackc-cxx
-         # This provides include directory in exported target
-         # relative to prefix in single directory we've put everything in.
-         INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-)
-
-# Install headers from source tree.
-INSTALL (DIRECTORY include/
-         DESTINATION include
-         COMPONENT msgpackc-cxx
-)
-
-INCLUDE (CMakePackageConfigHelpers)
-
-IF (NOT (CMAKE_VERSION VERSION_LESS 3.14))
-    SET (extra_version_file_args ARCH_INDEPENDENT)
+IF (NOT DEFINED CMAKE_INSTALL_LIBDIR)
+    SET(CMAKE_INSTALL_LIBDIR lib)
 ENDIF ()
-SET (cmake_config_path "${CMAKE_INSTALL_LIBDIR}/cmake/msgpackc-cxx")

-# Configure the main package file from source tree.
-CONFIGURE_PACKAGE_CONFIG_FILE (
-    msgpack-config.cmake.in
-    "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config.cmake"
-    INSTALL_DESTINATION "${cmake_config_path}"
-)
+INSTALL (TARGETS msgpack msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

-# Write package version file.
-WRITE_BASIC_PACKAGE_VERSION_FILE (
-    msgpack-config-version.cmake
-    VERSION ${VERSION}
-    COMPATIBILITY SameMajorVersion
-    ${extra_version_file_args}
-)
-
-# Install the generated package version file and the main package file.
-INSTALL (FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config-version.cmake"
-    DESTINATION "${cmake_config_path}"
-    COMPONENT msgpackc-cxx
-)
-
-# This installs package in install tree for using installed targets.
-INSTALL (
-    EXPORT msgpackc-cxx-targets
-    FILE msgpackc-cxx-targets.cmake
-    DESTINATION "${cmake_config_path}"
-    COMPONENT msgpackc-cxx
-)
+# Doxygen
+FIND_PACKAGE (Doxygen)
+IF (DOXYGEN_FOUND)
+    ADD_CUSTOM_TARGET (
+        doxygen_c
+        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+        COMMAND ${CMAKE_COMMAND} -E echo "FILE_PATTERNS      = *.h" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+        COMMAND ${CMAKE_COMMAND} -E echo "OUTPUT_DIRECTORY   = doc_c" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+        COMMAND ${CMAKE_COMMAND} -E echo "PROJECT_NAME       = \"MessagePack for C\"" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+        COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+        VERBATIM
+    )
+    ADD_CUSTOM_TARGET (
+        doxygen_cpp
+        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+        COMMAND ${CMAKE_COMMAND} -E echo "FILE_PATTERNS      = *.hpp" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+        COMMAND ${CMAKE_COMMAND} -E echo "OUTPUT_DIRECTORY   = doc_cpp" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+        COMMAND ${CMAKE_COMMAND} -E echo "PROJECT_NAME       = \"MessagePack for C++\"" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+        COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+        VERBATIM
+    )
+    ADD_CUSTOM_TARGET (
+        doxygen
+        DEPENDS doxygen_c doxygen_cpp
+    )
+ENDIF ()
--- a/17
+++ b/17
@@ -1,5 +1,14 @@
-Copyright (C) 2008-2015 FURUHASHI Sadayuki
+Copyright (C) 2008-2010 FURUHASHI Sadayuki
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

-   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)
--- a/CROSSLANG.md
+++ b/CROSSLANG.md
@@ -0,0 +1,38 @@
+MessagePack cross-language test cases
+=====================================
+
+## cases
+
+Valid serialized data are stored in "cases.mpac" and "cases_compact.mpac".
+These files describe same objects. And "cases.json" describes an array of the described objects.
+
+Thus you can verify your implementations as comparing the objects.
+
+
+## crosslang
+
+The *crosslang* tool reads serialized data from stdin and writes re-serialize data to stdout.
+
+There are C++ and Ruby implementation of crosslang tool. You can verify your implementation
+as comparing that implementations.
+
+### C++ version
+
+    $ cd ../cpp && ./configure && make && make install
+    or
+    $ port install msgpack  # MacPorts
+    
+    $ g++ -Wall crosslang.cc -lmsgpack -o crosslang
+
+    $ ./crosslang
+    Usage: ./crosslang [in-file] [out-file]
+
+### Ruby version
+
+    $ gem install msgpack
+    or
+    $ port install rb_msgpack   # MacPorts
+
+    $ ruby crosslang.rb
+    Usage: crosslang.rb [in-file] [out-file]
+
--- 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 roughly double the
+# a logarithmic scale so increasing the size by one will rougly 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
@@ -1,732 +0,0 @@
-SET (msgpackc_HEADERS
-    include/msgpack.hpp
-    include/msgpack/adaptor/adaptor_base.hpp
-    include/msgpack/adaptor/adaptor_base_decl.hpp
-    include/msgpack/adaptor/array_ref.hpp
-    include/msgpack/adaptor/array_ref_decl.hpp
-    include/msgpack/adaptor/bool.hpp
-    include/msgpack/adaptor/boost/fusion.hpp
-    include/msgpack/adaptor/boost/msgpack_variant.hpp
-    include/msgpack/adaptor/boost/msgpack_variant_decl.hpp
-    include/msgpack/adaptor/boost/optional.hpp
-    include/msgpack/adaptor/boost/string_ref.hpp
-    include/msgpack/adaptor/boost/string_view.hpp
-    include/msgpack/adaptor/carray.hpp
-    include/msgpack/adaptor/char_ptr.hpp
-    include/msgpack/adaptor/check_container_size.hpp
-    include/msgpack/adaptor/check_container_size_decl.hpp
-    include/msgpack/adaptor/complex.hpp
-    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/array_byte.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/cpp20/span.hpp
-    include/msgpack/adaptor/define.hpp
-    include/msgpack/adaptor/define_decl.hpp
-    include/msgpack/adaptor/deque.hpp
-    include/msgpack/adaptor/ext.hpp
-    include/msgpack/adaptor/ext_decl.hpp
-    include/msgpack/adaptor/fixint.hpp
-    include/msgpack/adaptor/fixint_decl.hpp
-    include/msgpack/adaptor/float.hpp
-    include/msgpack/adaptor/int.hpp
-    include/msgpack/adaptor/int_decl.hpp
-    include/msgpack/adaptor/list.hpp
-    include/msgpack/adaptor/map.hpp
-    include/msgpack/adaptor/map_decl.hpp
-    include/msgpack/adaptor/msgpack_tuple.hpp
-    include/msgpack/adaptor/msgpack_tuple_decl.hpp
-    include/msgpack/adaptor/nil.hpp
-    include/msgpack/adaptor/nil_decl.hpp
-    include/msgpack/adaptor/pair.hpp
-    include/msgpack/adaptor/raw.hpp
-    include/msgpack/adaptor/raw_decl.hpp
-    include/msgpack/adaptor/set.hpp
-    include/msgpack/adaptor/size_equal_only.hpp
-    include/msgpack/adaptor/size_equal_only_decl.hpp
-    include/msgpack/adaptor/string.hpp
-    include/msgpack/adaptor/tr1/unordered_map.hpp
-    include/msgpack/adaptor/tr1/unordered_set.hpp
-    include/msgpack/adaptor/v4raw.hpp
-    include/msgpack/adaptor/v4raw_decl.hpp
-    include/msgpack/adaptor/vector.hpp
-    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/assert.hpp
-    include/msgpack/cpp_config.hpp
-    include/msgpack/cpp_config_decl.hpp
-    include/msgpack/cpp_version.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
-    include/msgpack/iterator.hpp
-    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/predef.h
-    include/msgpack/predef/architecture.h
-    include/msgpack/predef/architecture/alpha.h
-    include/msgpack/predef/architecture/arm.h
-    include/msgpack/predef/architecture/blackfin.h
-    include/msgpack/predef/architecture/convex.h
-    include/msgpack/predef/architecture/ia64.h
-    include/msgpack/predef/architecture/m68k.h
-    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
-    include/msgpack/predef/architecture/superh.h
-    include/msgpack/predef/architecture/sys370.h
-    include/msgpack/predef/architecture/sys390.h
-    include/msgpack/predef/architecture/x86.h
-    include/msgpack/predef/architecture/x86/32.h
-    include/msgpack/predef/architecture/x86/64.h
-    include/msgpack/predef/architecture/z.h
-    include/msgpack/predef/compiler.h
-    include/msgpack/predef/compiler/borland.h
-    include/msgpack/predef/compiler/clang.h
-    include/msgpack/predef/compiler/comeau.h
-    include/msgpack/predef/compiler/compaq.h
-    include/msgpack/predef/compiler/diab.h
-    include/msgpack/predef/compiler/digitalmars.h
-    include/msgpack/predef/compiler/dignus.h
-    include/msgpack/predef/compiler/edg.h
-    include/msgpack/predef/compiler/ekopath.h
-    include/msgpack/predef/compiler/gcc.h
-    include/msgpack/predef/compiler/gcc_xml.h
-    include/msgpack/predef/compiler/greenhills.h
-    include/msgpack/predef/compiler/hp_acc.h
-    include/msgpack/predef/compiler/iar.h
-    include/msgpack/predef/compiler/ibm.h
-    include/msgpack/predef/compiler/intel.h
-    include/msgpack/predef/compiler/kai.h
-    include/msgpack/predef/compiler/llvm.h
-    include/msgpack/predef/compiler/metaware.h
-    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
-    include/msgpack/predef/compiler/sunpro.h
-    include/msgpack/predef/compiler/tendra.h
-    include/msgpack/predef/compiler/visualc.h
-    include/msgpack/predef/compiler/watcom.h
-    include/msgpack/predef/detail/_cassert.h
-    include/msgpack/predef/detail/_exception.h
-    include/msgpack/predef/detail/comp_detected.h
-    include/msgpack/predef/detail/endian_compat.h
-    include/msgpack/predef/detail/os_detected.h
-    include/msgpack/predef/detail/platform_detected.h
-    include/msgpack/predef/detail/test.h
-    include/msgpack/predef/detail/test_def.h
-    include/msgpack/predef/hardware.h
-    include/msgpack/predef/hardware/simd.h
-    include/msgpack/predef/hardware/simd/arm.h
-    include/msgpack/predef/hardware/simd/arm/versions.h
-    include/msgpack/predef/hardware/simd/ppc.h
-    include/msgpack/predef/hardware/simd/ppc/versions.h
-    include/msgpack/predef/hardware/simd/x86.h
-    include/msgpack/predef/hardware/simd/x86/versions.h
-    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
-    include/msgpack/predef/library/c/zos.h
-    include/msgpack/predef/library/std.h
-    include/msgpack/predef/library/std/_prefix.h
-    include/msgpack/predef/library/std/cxx.h
-    include/msgpack/predef/library/std/dinkumware.h
-    include/msgpack/predef/library/std/libcomo.h
-    include/msgpack/predef/library/std/modena.h
-    include/msgpack/predef/library/std/msl.h
-    include/msgpack/predef/library/std/roguewave.h
-    include/msgpack/predef/library/std/sgi.h
-    include/msgpack/predef/library/std/stdcpp3.h
-    include/msgpack/predef/library/std/stlport.h
-    include/msgpack/predef/library/std/vacpp.h
-    include/msgpack/predef/make.h
-    include/msgpack/predef/os.h
-    include/msgpack/predef/os/aix.h
-    include/msgpack/predef/os/amigaos.h
-    include/msgpack/predef/os/android.h
-    include/msgpack/predef/os/beos.h
-    include/msgpack/predef/os/bsd.h
-    include/msgpack/predef/os/bsd/bsdi.h
-    include/msgpack/predef/os/bsd/dragonfly.h
-    include/msgpack/predef/os/bsd/free.h
-    include/msgpack/predef/os/bsd/net.h
-    include/msgpack/predef/os/bsd/open.h
-    include/msgpack/predef/os/cygwin.h
-    include/msgpack/predef/os/haiku.h
-    include/msgpack/predef/os/hpux.h
-    include/msgpack/predef/os/ios.h
-    include/msgpack/predef/os/irix.h
-    include/msgpack/predef/os/linux.h
-    include/msgpack/predef/os/macos.h
-    include/msgpack/predef/os/os400.h
-    include/msgpack/predef/os/qnxnto.h
-    include/msgpack/predef/os/solaris.h
-    include/msgpack/predef/os/unix.h
-    include/msgpack/predef/os/vms.h
-    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/preprocessor.hpp
-    include/msgpack/preprocessor/arithmetic.hpp
-    include/msgpack/preprocessor/arithmetic/add.hpp
-    include/msgpack/preprocessor/arithmetic/dec.hpp
-    include/msgpack/preprocessor/arithmetic/detail/div_base.hpp
-    include/msgpack/preprocessor/arithmetic/div.hpp
-    include/msgpack/preprocessor/arithmetic/inc.hpp
-    include/msgpack/preprocessor/arithmetic/mod.hpp
-    include/msgpack/preprocessor/arithmetic/mul.hpp
-    include/msgpack/preprocessor/arithmetic/sub.hpp
-    include/msgpack/preprocessor/array.hpp
-    include/msgpack/preprocessor/array/data.hpp
-    include/msgpack/preprocessor/array/detail/get_data.hpp
-    include/msgpack/preprocessor/array/elem.hpp
-    include/msgpack/preprocessor/array/enum.hpp
-    include/msgpack/preprocessor/array/insert.hpp
-    include/msgpack/preprocessor/array/pop_back.hpp
-    include/msgpack/preprocessor/array/pop_front.hpp
-    include/msgpack/preprocessor/array/push_back.hpp
-    include/msgpack/preprocessor/array/push_front.hpp
-    include/msgpack/preprocessor/array/remove.hpp
-    include/msgpack/preprocessor/array/replace.hpp
-    include/msgpack/preprocessor/array/reverse.hpp
-    include/msgpack/preprocessor/array/size.hpp
-    include/msgpack/preprocessor/array/to_list.hpp
-    include/msgpack/preprocessor/array/to_seq.hpp
-    include/msgpack/preprocessor/array/to_tuple.hpp
-    include/msgpack/preprocessor/assert_msg.hpp
-    include/msgpack/preprocessor/cat.hpp
-    include/msgpack/preprocessor/comma.hpp
-    include/msgpack/preprocessor/comma_if.hpp
-    include/msgpack/preprocessor/comparison.hpp
-    include/msgpack/preprocessor/comparison/equal.hpp
-    include/msgpack/preprocessor/comparison/greater.hpp
-    include/msgpack/preprocessor/comparison/greater_equal.hpp
-    include/msgpack/preprocessor/comparison/less.hpp
-    include/msgpack/preprocessor/comparison/less_equal.hpp
-    include/msgpack/preprocessor/comparison/not_equal.hpp
-    include/msgpack/preprocessor/config/config.hpp
-    include/msgpack/preprocessor/config/limits.hpp
-    include/msgpack/preprocessor/control.hpp
-    include/msgpack/preprocessor/control/deduce_d.hpp
-    include/msgpack/preprocessor/control/detail/dmc/while.hpp
-    include/msgpack/preprocessor/control/detail/edg/while.hpp
-    include/msgpack/preprocessor/control/detail/msvc/while.hpp
-    include/msgpack/preprocessor/control/detail/while.hpp
-    include/msgpack/preprocessor/control/expr_if.hpp
-    include/msgpack/preprocessor/control/expr_iif.hpp
-    include/msgpack/preprocessor/control/if.hpp
-    include/msgpack/preprocessor/control/iif.hpp
-    include/msgpack/preprocessor/control/while.hpp
-    include/msgpack/preprocessor/debug.hpp
-    include/msgpack/preprocessor/debug/assert.hpp
-    include/msgpack/preprocessor/debug/error.hpp
-    include/msgpack/preprocessor/debug/line.hpp
-    include/msgpack/preprocessor/dec.hpp
-    include/msgpack/preprocessor/detail/auto_rec.hpp
-    include/msgpack/preprocessor/detail/check.hpp
-    include/msgpack/preprocessor/detail/dmc/auto_rec.hpp
-    include/msgpack/preprocessor/detail/is_binary.hpp
-    include/msgpack/preprocessor/detail/is_nullary.hpp
-    include/msgpack/preprocessor/detail/is_unary.hpp
-    include/msgpack/preprocessor/detail/null.hpp
-    include/msgpack/preprocessor/detail/split.hpp
-    include/msgpack/preprocessor/empty.hpp
-    include/msgpack/preprocessor/enum.hpp
-    include/msgpack/preprocessor/enum_params.hpp
-    include/msgpack/preprocessor/enum_params_with_a_default.hpp
-    include/msgpack/preprocessor/enum_params_with_defaults.hpp
-    include/msgpack/preprocessor/enum_shifted.hpp
-    include/msgpack/preprocessor/enum_shifted_params.hpp
-    include/msgpack/preprocessor/expand.hpp
-    include/msgpack/preprocessor/expr_if.hpp
-    include/msgpack/preprocessor/facilities.hpp
-    include/msgpack/preprocessor/facilities/apply.hpp
-    include/msgpack/preprocessor/facilities/detail/is_empty.hpp
-    include/msgpack/preprocessor/facilities/empty.hpp
-    include/msgpack/preprocessor/facilities/expand.hpp
-    include/msgpack/preprocessor/facilities/identity.hpp
-    include/msgpack/preprocessor/facilities/intercept.hpp
-    include/msgpack/preprocessor/facilities/is_1.hpp
-    include/msgpack/preprocessor/facilities/is_empty.hpp
-    include/msgpack/preprocessor/facilities/is_empty_or_1.hpp
-    include/msgpack/preprocessor/facilities/is_empty_variadic.hpp
-    include/msgpack/preprocessor/facilities/overload.hpp
-    include/msgpack/preprocessor/for.hpp
-    include/msgpack/preprocessor/identity.hpp
-    include/msgpack/preprocessor/if.hpp
-    include/msgpack/preprocessor/inc.hpp
-    include/msgpack/preprocessor/iterate.hpp
-    include/msgpack/preprocessor/iteration.hpp
-    include/msgpack/preprocessor/iteration/detail/bounds/lower1.hpp
-    include/msgpack/preprocessor/iteration/detail/bounds/lower2.hpp
-    include/msgpack/preprocessor/iteration/detail/bounds/lower3.hpp
-    include/msgpack/preprocessor/iteration/detail/bounds/lower4.hpp
-    include/msgpack/preprocessor/iteration/detail/bounds/lower5.hpp
-    include/msgpack/preprocessor/iteration/detail/bounds/upper1.hpp
-    include/msgpack/preprocessor/iteration/detail/bounds/upper2.hpp
-    include/msgpack/preprocessor/iteration/detail/bounds/upper3.hpp
-    include/msgpack/preprocessor/iteration/detail/bounds/upper4.hpp
-    include/msgpack/preprocessor/iteration/detail/bounds/upper5.hpp
-    include/msgpack/preprocessor/iteration/detail/finish.hpp
-    include/msgpack/preprocessor/iteration/detail/iter/forward1.hpp
-    include/msgpack/preprocessor/iteration/detail/iter/forward2.hpp
-    include/msgpack/preprocessor/iteration/detail/iter/forward3.hpp
-    include/msgpack/preprocessor/iteration/detail/iter/forward4.hpp
-    include/msgpack/preprocessor/iteration/detail/iter/forward5.hpp
-    include/msgpack/preprocessor/iteration/detail/iter/reverse1.hpp
-    include/msgpack/preprocessor/iteration/detail/iter/reverse2.hpp
-    include/msgpack/preprocessor/iteration/detail/iter/reverse3.hpp
-    include/msgpack/preprocessor/iteration/detail/iter/reverse4.hpp
-    include/msgpack/preprocessor/iteration/detail/iter/reverse5.hpp
-    include/msgpack/preprocessor/iteration/detail/local.hpp
-    include/msgpack/preprocessor/iteration/detail/rlocal.hpp
-    include/msgpack/preprocessor/iteration/detail/self.hpp
-    include/msgpack/preprocessor/iteration/detail/start.hpp
-    include/msgpack/preprocessor/iteration/iterate.hpp
-    include/msgpack/preprocessor/iteration/local.hpp
-    include/msgpack/preprocessor/iteration/self.hpp
-    include/msgpack/preprocessor/library.hpp
-    include/msgpack/preprocessor/limits.hpp
-    include/msgpack/preprocessor/list.hpp
-    include/msgpack/preprocessor/list/adt.hpp
-    include/msgpack/preprocessor/list/append.hpp
-    include/msgpack/preprocessor/list/at.hpp
-    include/msgpack/preprocessor/list/cat.hpp
-    include/msgpack/preprocessor/list/detail/dmc/fold_left.hpp
-    include/msgpack/preprocessor/list/detail/edg/fold_left.hpp
-    include/msgpack/preprocessor/list/detail/edg/fold_right.hpp
-    include/msgpack/preprocessor/list/detail/fold_left.hpp
-    include/msgpack/preprocessor/list/detail/fold_right.hpp
-    include/msgpack/preprocessor/list/enum.hpp
-    include/msgpack/preprocessor/list/filter.hpp
-    include/msgpack/preprocessor/list/first_n.hpp
-    include/msgpack/preprocessor/list/fold_left.hpp
-    include/msgpack/preprocessor/list/fold_right.hpp
-    include/msgpack/preprocessor/list/for_each.hpp
-    include/msgpack/preprocessor/list/for_each_i.hpp
-    include/msgpack/preprocessor/list/for_each_product.hpp
-    include/msgpack/preprocessor/list/rest_n.hpp
-    include/msgpack/preprocessor/list/reverse.hpp
-    include/msgpack/preprocessor/list/size.hpp
-    include/msgpack/preprocessor/list/to_array.hpp
-    include/msgpack/preprocessor/list/to_seq.hpp
-    include/msgpack/preprocessor/list/to_tuple.hpp
-    include/msgpack/preprocessor/list/transform.hpp
-    include/msgpack/preprocessor/logical.hpp
-    include/msgpack/preprocessor/logical/and.hpp
-    include/msgpack/preprocessor/logical/bitand.hpp
-    include/msgpack/preprocessor/logical/bitnor.hpp
-    include/msgpack/preprocessor/logical/bitor.hpp
-    include/msgpack/preprocessor/logical/bitxor.hpp
-    include/msgpack/preprocessor/logical/bool.hpp
-    include/msgpack/preprocessor/logical/compl.hpp
-    include/msgpack/preprocessor/logical/nor.hpp
-    include/msgpack/preprocessor/logical/not.hpp
-    include/msgpack/preprocessor/logical/or.hpp
-    include/msgpack/preprocessor/logical/xor.hpp
-    include/msgpack/preprocessor/max.hpp
-    include/msgpack/preprocessor/min.hpp
-    include/msgpack/preprocessor/punctuation.hpp
-    include/msgpack/preprocessor/punctuation/comma.hpp
-    include/msgpack/preprocessor/punctuation/comma_if.hpp
-    include/msgpack/preprocessor/punctuation/detail/is_begin_parens.hpp
-    include/msgpack/preprocessor/punctuation/is_begin_parens.hpp
-    include/msgpack/preprocessor/punctuation/paren.hpp
-    include/msgpack/preprocessor/punctuation/paren_if.hpp
-    include/msgpack/preprocessor/punctuation/remove_parens.hpp
-    include/msgpack/preprocessor/repeat.hpp
-    include/msgpack/preprocessor/repeat_2nd.hpp
-    include/msgpack/preprocessor/repeat_3rd.hpp
-    include/msgpack/preprocessor/repeat_from_to.hpp
-    include/msgpack/preprocessor/repeat_from_to_2nd.hpp
-    include/msgpack/preprocessor/repeat_from_to_3rd.hpp
-    include/msgpack/preprocessor/repetition.hpp
-    include/msgpack/preprocessor/repetition/deduce_r.hpp
-    include/msgpack/preprocessor/repetition/deduce_z.hpp
-    include/msgpack/preprocessor/repetition/detail/dmc/for.hpp
-    include/msgpack/preprocessor/repetition/detail/edg/for.hpp
-    include/msgpack/preprocessor/repetition/detail/for.hpp
-    include/msgpack/preprocessor/repetition/detail/msvc/for.hpp
-    include/msgpack/preprocessor/repetition/enum.hpp
-    include/msgpack/preprocessor/repetition/enum_binary_params.hpp
-    include/msgpack/preprocessor/repetition/enum_params.hpp
-    include/msgpack/preprocessor/repetition/enum_params_with_a_default.hpp
-    include/msgpack/preprocessor/repetition/enum_params_with_defaults.hpp
-    include/msgpack/preprocessor/repetition/enum_shifted.hpp
-    include/msgpack/preprocessor/repetition/enum_shifted_binary_params.hpp
-    include/msgpack/preprocessor/repetition/enum_shifted_params.hpp
-    include/msgpack/preprocessor/repetition/enum_trailing.hpp
-    include/msgpack/preprocessor/repetition/enum_trailing_binary_params.hpp
-    include/msgpack/preprocessor/repetition/enum_trailing_params.hpp
-    include/msgpack/preprocessor/repetition/for.hpp
-    include/msgpack/preprocessor/repetition/repeat.hpp
-    include/msgpack/preprocessor/repetition/repeat_from_to.hpp
-    include/msgpack/preprocessor/selection.hpp
-    include/msgpack/preprocessor/selection/max.hpp
-    include/msgpack/preprocessor/selection/min.hpp
-    include/msgpack/preprocessor/seq.hpp
-    include/msgpack/preprocessor/seq/cat.hpp
-    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
-    include/msgpack/preprocessor/seq/first_n.hpp
-    include/msgpack/preprocessor/seq/fold_left.hpp
-    include/msgpack/preprocessor/seq/fold_right.hpp
-    include/msgpack/preprocessor/seq/for_each.hpp
-    include/msgpack/preprocessor/seq/for_each_i.hpp
-    include/msgpack/preprocessor/seq/for_each_product.hpp
-    include/msgpack/preprocessor/seq/insert.hpp
-    include/msgpack/preprocessor/seq/pop_back.hpp
-    include/msgpack/preprocessor/seq/pop_front.hpp
-    include/msgpack/preprocessor/seq/push_back.hpp
-    include/msgpack/preprocessor/seq/push_front.hpp
-    include/msgpack/preprocessor/seq/remove.hpp
-    include/msgpack/preprocessor/seq/replace.hpp
-    include/msgpack/preprocessor/seq/rest_n.hpp
-    include/msgpack/preprocessor/seq/reverse.hpp
-    include/msgpack/preprocessor/seq/seq.hpp
-    include/msgpack/preprocessor/seq/size.hpp
-    include/msgpack/preprocessor/seq/subseq.hpp
-    include/msgpack/preprocessor/seq/to_array.hpp
-    include/msgpack/preprocessor/seq/to_list.hpp
-    include/msgpack/preprocessor/seq/to_tuple.hpp
-    include/msgpack/preprocessor/seq/transform.hpp
-    include/msgpack/preprocessor/seq/variadic_seq_to_seq.hpp
-    include/msgpack/preprocessor/slot.hpp
-    include/msgpack/preprocessor/slot/counter.hpp
-    include/msgpack/preprocessor/slot/detail/counter.hpp
-    include/msgpack/preprocessor/slot/detail/def.hpp
-    include/msgpack/preprocessor/slot/detail/shared.hpp
-    include/msgpack/preprocessor/slot/detail/slot1.hpp
-    include/msgpack/preprocessor/slot/detail/slot2.hpp
-    include/msgpack/preprocessor/slot/detail/slot3.hpp
-    include/msgpack/preprocessor/slot/detail/slot4.hpp
-    include/msgpack/preprocessor/slot/detail/slot5.hpp
-    include/msgpack/preprocessor/slot/slot.hpp
-    include/msgpack/preprocessor/stringize.hpp
-    include/msgpack/preprocessor/tuple.hpp
-    include/msgpack/preprocessor/tuple/detail/is_single_return.hpp
-    include/msgpack/preprocessor/tuple/eat.hpp
-    include/msgpack/preprocessor/tuple/elem.hpp
-    include/msgpack/preprocessor/tuple/enum.hpp
-    include/msgpack/preprocessor/tuple/insert.hpp
-    include/msgpack/preprocessor/tuple/pop_back.hpp
-    include/msgpack/preprocessor/tuple/pop_front.hpp
-    include/msgpack/preprocessor/tuple/push_back.hpp
-    include/msgpack/preprocessor/tuple/push_front.hpp
-    include/msgpack/preprocessor/tuple/rem.hpp
-    include/msgpack/preprocessor/tuple/remove.hpp
-    include/msgpack/preprocessor/tuple/replace.hpp
-    include/msgpack/preprocessor/tuple/reverse.hpp
-    include/msgpack/preprocessor/tuple/size.hpp
-    include/msgpack/preprocessor/tuple/to_array.hpp
-    include/msgpack/preprocessor/tuple/to_list.hpp
-    include/msgpack/preprocessor/tuple/to_seq.hpp
-    include/msgpack/preprocessor/variadic.hpp
-    include/msgpack/preprocessor/variadic/detail/is_single_return.hpp
-    include/msgpack/preprocessor/variadic/elem.hpp
-    include/msgpack/preprocessor/variadic/size.hpp
-    include/msgpack/preprocessor/variadic/to_array.hpp
-    include/msgpack/preprocessor/variadic/to_list.hpp
-    include/msgpack/preprocessor/variadic/to_seq.hpp
-    include/msgpack/preprocessor/variadic/to_tuple.hpp
-    include/msgpack/preprocessor/while.hpp
-    include/msgpack/preprocessor/wstringize.hpp
-    include/msgpack/sbuffer.hpp
-    include/msgpack/sbuffer_decl.hpp
-    include/msgpack/sysdep.hpp
-    include/msgpack/type.hpp
-    include/msgpack/unpack.hpp
-    include/msgpack/unpack_decl.hpp
-    include/msgpack/unpack_define.hpp
-    include/msgpack/unpack_exception.hpp
-    include/msgpack/v1/adaptor/adaptor_base.hpp
-    include/msgpack/v1/adaptor/adaptor_base_decl.hpp
-    include/msgpack/v1/adaptor/array_ref.hpp
-    include/msgpack/v1/adaptor/array_ref_decl.hpp
-    include/msgpack/v1/adaptor/bool.hpp
-    include/msgpack/v1/adaptor/boost/fusion.hpp
-    include/msgpack/v1/adaptor/boost/msgpack_variant.hpp
-    include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp
-    include/msgpack/v1/adaptor/boost/optional.hpp
-    include/msgpack/v1/adaptor/boost/string_ref.hpp
-    include/msgpack/v1/adaptor/boost/string_view.hpp
-    include/msgpack/v1/adaptor/carray.hpp
-    include/msgpack/v1/adaptor/char_ptr.hpp
-    include/msgpack/v1/adaptor/check_container_size.hpp
-    include/msgpack/v1/adaptor/check_container_size_decl.hpp
-    include/msgpack/v1/adaptor/complex.hpp
-    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/array_byte.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/cpp20/span.hpp
-    include/msgpack/v1/adaptor/define.hpp
-    include/msgpack/v1/adaptor/define_decl.hpp
-    include/msgpack/v1/adaptor/deque.hpp
-    include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
-    include/msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp
-    include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp
-    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
-    include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp
-    include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp
-    include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
-    include/msgpack/v1/adaptor/ext.hpp
-    include/msgpack/v1/adaptor/ext_decl.hpp
-    include/msgpack/v1/adaptor/fixint.hpp
-    include/msgpack/v1/adaptor/fixint_decl.hpp
-    include/msgpack/v1/adaptor/float.hpp
-    include/msgpack/v1/adaptor/int.hpp
-    include/msgpack/v1/adaptor/int_decl.hpp
-    include/msgpack/v1/adaptor/list.hpp
-    include/msgpack/v1/adaptor/map.hpp
-    include/msgpack/v1/adaptor/map_decl.hpp
-    include/msgpack/v1/adaptor/msgpack_tuple.hpp
-    include/msgpack/v1/adaptor/msgpack_tuple_decl.hpp
-    include/msgpack/v1/adaptor/nil.hpp
-    include/msgpack/v1/adaptor/nil_decl.hpp
-    include/msgpack/v1/adaptor/pair.hpp
-    include/msgpack/v1/adaptor/raw.hpp
-    include/msgpack/v1/adaptor/raw_decl.hpp
-    include/msgpack/v1/adaptor/set.hpp
-    include/msgpack/v1/adaptor/size_equal_only.hpp
-    include/msgpack/v1/adaptor/size_equal_only_decl.hpp
-    include/msgpack/v1/adaptor/string.hpp
-    include/msgpack/v1/adaptor/tr1/unordered_map.hpp
-    include/msgpack/v1/adaptor/tr1/unordered_set.hpp
-    include/msgpack/v1/adaptor/v4raw.hpp
-    include/msgpack/v1/adaptor/v4raw_decl.hpp
-    include/msgpack/v1/adaptor/vector.hpp
-    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
-    include/msgpack/v1/detail/cpp03_zone_decl.hpp
-    include/msgpack/v1/detail/cpp11_zone.hpp
-    include/msgpack/v1/detail/cpp11_zone_decl.hpp
-    include/msgpack/v1/fbuffer.hpp
-    include/msgpack/v1/fbuffer_decl.hpp
-    include/msgpack/v1/iterator.hpp
-    include/msgpack/v1/iterator_decl.hpp
-    include/msgpack/v1/meta.hpp
-    include/msgpack/v1/meta_decl.hpp
-    include/msgpack/v1/object.hpp
-    include/msgpack/v1/object_decl.hpp
-    include/msgpack/v1/object_fwd.hpp
-    include/msgpack/v1/object_fwd_decl.hpp
-    include/msgpack/v1/pack.hpp
-    include/msgpack/v1/pack_decl.hpp
-    include/msgpack/v1/parse_return.hpp
-    include/msgpack/v1/sbuffer.hpp
-    include/msgpack/v1/sbuffer_decl.hpp
-    include/msgpack/v1/unpack.hpp
-    include/msgpack/v1/unpack_decl.hpp
-    include/msgpack/v1/unpack_exception.hpp
-    include/msgpack/v1/version.hpp
-    include/msgpack/v1/versioning.hpp
-    include/msgpack/v1/vrefbuffer.hpp
-    include/msgpack/v1/vrefbuffer_decl.hpp
-    include/msgpack/v1/zbuffer.hpp
-    include/msgpack/v1/zbuffer_decl.hpp
-    include/msgpack/v1/zone.hpp
-    include/msgpack/v1/zone_decl.hpp
-    include/msgpack/v2/adaptor/adaptor_base.hpp
-    include/msgpack/v2/adaptor/adaptor_base_decl.hpp
-    include/msgpack/v2/adaptor/array_ref_decl.hpp
-    include/msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp
-    include/msgpack/v2/adaptor/check_container_size_decl.hpp
-    include/msgpack/v2/adaptor/define_decl.hpp
-    include/msgpack/v2/adaptor/detail/cpp03_define_array_decl.hpp
-    include/msgpack/v2/adaptor/detail/cpp03_define_map_decl.hpp
-    include/msgpack/v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
-    include/msgpack/v2/adaptor/detail/cpp11_define_array_decl.hpp
-    include/msgpack/v2/adaptor/detail/cpp11_define_map_decl.hpp
-    include/msgpack/v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
-    include/msgpack/v2/adaptor/ext_decl.hpp
-    include/msgpack/v2/adaptor/fixint_decl.hpp
-    include/msgpack/v2/adaptor/int_decl.hpp
-    include/msgpack/v2/adaptor/map_decl.hpp
-    include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp
-    include/msgpack/v2/adaptor/nil_decl.hpp
-    include/msgpack/v2/adaptor/raw_decl.hpp
-    include/msgpack/v2/adaptor/size_equal_only_decl.hpp
-    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/version_master.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
-    include/msgpack/zone_decl.hpp
-)
--- a/202
+++ b/202
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/LICENSE_1_0.txt
+++ b/LICENSE_1_0.txt
@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--- a/Makefile.am
+++ b/Makefile.am
@@ -0,0 +1,21 @@
+SUBDIRS = src test
+
+DOC_FILES = \
+		README.md \
+		LICENSE \
+		NOTICE \
+		msgpack_vc8.vcproj \
+		msgpack_vc8.sln \
+		msgpack_vc.postbuild.bat
+
+EXTRA_DIST = \
+		$(DOC_FILES) CMakeLists.txt test/CMakeLists.txt
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = msgpack.pc
+
+doxygen:
+	./preprocess clean
+	cd src && $(MAKE) doxygen
+	./preprocess
+
--- a/14
+++ b/14
@@ -1,14 +0,0 @@
-This product bundles Boost Predef and Boost Preprocessor.
-They are 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)
-
-For details, see the following files:
-
-external/boost/predef
-include/msgpack/predef.h
-include/msgpack/predef/*
-
-external/boost/preprocessor
-include/msgpack/preprocessor.hpp
-include/msgpack/preprocessor/*
--- a/QUICKSTART-C.md
+++ b/QUICKSTART-C.md
@@ -0,0 +1,194 @@
+# Implementation Status
+
+The serialization library is production-ready.
+
+Currently, RPC implementation is not available.
+
+# Install
+
+
+## Mac OS X with MacPorts
+
+On Mac OS X, you can install MessagePack for C using MacPorts.
+
+```
+$ sudo port install msgpack
+```
+
+You might need to run `sudo port selfupdate` before installing to update the package repository.
+
+You can also install via Homebrew.
+
+```
+$ sudo brew install msgpack
+```
+
+## FreeBSD with Ports Collection
+
+On FreeBSD, you can use Ports Collection. Install [net/msgpack|http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/msgpack/] package.
+
+## Gentoo Linux with Portage
+
+On Gentoo Linux, you can use emerge. Install [dev-libs/msgpack|http://gentoo-portage.com/dev-libs/msgpack] package.
+
+## Other UNIX-like platform with ./configure
+
+On the other UNIX-like platforms, download source package from [Releases|http://msgpack.org/releases/cpp/] and run `./configure && make && make install`.
+
+```
+$ wget http://msgpack.org/releases/cpp/msgpack-0.5.5.tar.gz
+$ tar zxvf msgpack-0.5.5.tar.gz
+$ cd msgpack-0.5.5
+$ ./configure
+$ make
+$ sudo make install
+```
+
+## Windows
+
+On Windows, download source package from [here|https://sourceforge.net/projects/msgpack/files/] and extract it.
+Then open `msgpack_vc8.vcproj` file and build it using batch build. It builds libraries on `lib/` folder and header files on `include/` folder.
+
+You can build using command line as follows:
+
+```
+> vcbuild msgpack_vc2008.vcproj
+> dir lib       % DLL files are here
+> dir include   % header files are here
+```
+
+## Install from git repository
+
+You need to install gcc (4.1.0 or higher), autotools.
+
+```
+$ git clone git@github.com:msgpack/msgpack.git
+$ cd msgpack/cpp
+$ ./bootstrap
+$ ./configure
+$ make
+$ sudo make install
+```
+
+# Serialization QuickStart for C
+
+## First program
+
+Include `msgpack.h` header and link `msgpack` library to use MessagePack on your program.
+
+```c
+#include <msgpack.h>
+#include <stdio.h>
+
+int main(void) {
+
+        /* creates buffer and serializer instance. */
+        msgpack_sbuffer* buffer = msgpack_sbuffer_new();
+        msgpack_packer* pk = msgpack_packer_new(buffer, msgpack_sbuffer_write);
+
+        /* serializes ["Hello", "MessagePack"]. */
+        msgpack_pack_array(pk, 2);
+        msgpack_pack_raw(pk, 5);
+        msgpack_pack_raw_body(pk, "Hello", 5);
+        msgpack_pack_raw(pk, 11);
+        msgpack_pack_raw_body(pk, "MessagePack", 11);
+
+        /* deserializes it. */
+        msgpack_unpacked msg;
+        msgpack_unpacked_init(&msg);
+        bool success = msgpack_unpack_next(&msg, buffer->data, buffer->size, NULL);
+
+        /* prints the deserialized object. */
+        msgpack_object obj = msg.data;
+        msgpack_object_print(stdout, obj);  /*=> ["Hello", "MessagePack"] */
+
+        /* cleaning */
+        msgpack_sbuffer_free(buffer);
+        msgpack_packer_free(pk);
+}
+```
+
+## Simple program with a loop
+
+```c
+#include <msgpack.h>
+#include <stdio.h>
+
+int main(void) {
+
+        /* creates buffer and serializer instance. */
+        msgpack_sbuffer* buffer = msgpack_sbuffer_new();
+        msgpack_packer* pk = msgpack_packer_new(buffer, msgpack_sbuffer_write);
+        
+        int j;
+
+        for(j = 0; j<23; j++) {
+           /* NB: the buffer needs to be cleared on each iteration */
+           msgpack_sbuffer_clear(buffer);
+
+           /* serializes ["Hello", "MessagePack"]. */
+           msgpack_pack_array(pk, 3);
+           msgpack_pack_raw(pk, 5);
+           msgpack_pack_raw_body(pk, "Hello", 5);
+           msgpack_pack_raw(pk, 11);
+           msgpack_pack_raw_body(pk, "MessagePack", 11);
+           msgpack_pack_int(pk, j);
+
+           /* deserializes it. */
+           msgpack_unpacked msg;
+           msgpack_unpacked_init(&msg);
+           bool success = msgpack_unpack_next(&msg, buffer->data, buffer->size, NULL);
+
+           /* prints the deserialized object. */
+           msgpack_object obj = msg.data;
+           msgpack_object_print(stdout, obj);  /*=> ["Hello", "MessagePack"] */
+           puts("");
+        }
+
+        /* cleaning */
+        msgpack_sbuffer_free(buffer);
+        msgpack_packer_free(pk);
+}
+```
+
+## Streaming feature
+
+```c
+#include <msgpack.h>
+#include <stdio.h>
+
+int main(void) {
+        /* serializes multiple objects using msgpack_packer. */
+        msgpack_sbuffer* buffer = msgpack_sbuffer_new();
+        msgpack_packer* pk = msgpack_packer_new(buffer, msgpack_sbuffer_write);
+        msgpack_pack_int(pk, 1);
+        msgpack_pack_int(pk, 2);
+        msgpack_pack_int(pk, 3);
+
+        /* deserializes these objects using msgpack_unpacker. */
+        msgpack_unpacker pac;
+        msgpack_unpacker_init(&pac, MSGPACK_UNPACKER_INIT_BUFFER_SIZE);
+
+        /* feeds the buffer. */
+        msgpack_unpacker_reserve_buffer(&pac, buffer->size);
+        memcpy(msgpack_unpacker_buffer(&pac), buffer->data, buffer->size);
+        msgpack_unpacker_buffer_consumed(&pac, buffer->size);
+
+        /* now starts streaming deserialization. */
+        msgpack_unpacked result;
+        msgpack_unpacked_init(&result);
+
+        while(msgpack_unpacker_next(&pac, &result)) {
+            msgpack_object_print(stdout, result.data);
+            puts("");
+        }
+
+        /* results:
+         * $ gcc stream.cc -lmsgpack -o stream
+         * $ ./stream
+         * 1
+         * 2
+         * 3
+         */
+}
+```
--- a/QUICKSTART-CPP.md
+++ b/QUICKSTART-CPP.md
@@ -31,23 +31,23 @@ int main(void) {
        msgpack::pack(sbuf, vec);

        // deserialize it.
-        msgpack::object_handle oh =
-            msgpack::unpack(sbuf.data(), sbuf.size());
+        msgpack::unpacked msg;
+        msgpack::unpack(&msg, sbuf.data(), sbuf.size());

        // print the deserialized object.
-        msgpack::object obj = oh.get();
+        msgpack::object obj = msg.get();
        std::cout << obj << std::endl;  //=> ["Hello", "MessagePack"]

        // convert it into statically typed object.
        std::vector<std::string> rvec;
-        obj.convert(rvec);
+        obj.convert(&rvec);
 }
 ```

 Compile it as follows:

 ```
-$ g++ -Ipath_to_msgpack/include hello.cc -o hello
+$ g++ hello.cc -lmsgpack -o hello
 $ ./hello
 ["Hello", "MessagePack"]
 ```
@@ -59,7 +59,7 @@ $ ./hello
 #include <iostream>
 #include <string>

-int main() {
+int main(void) {
        // serializes multiple objects using msgpack::packer.
        msgpack::sbuffer buffer;

@@ -77,13 +77,13 @@ int main() {
        pac.buffer_consumed(buffer.size());

        // now starts streaming deserialization.
-        msgpack::object_handle oh;
-        while(pac.next(oh)) {
-            std::cout << oh.get() << std::endl;
+        msgpack::unpacked result;
+        while(pac.next(&result)) {
+            std::cout << result.get() << std::endl;
        }

        // results:
-        // $ g++ -Ipath_to_msgpack/include stream.cc -o stream
+        // $ g++ stream.cc -lmsgpack -o stream
        // $ ./stream
        // "Log message ... 1"
        // "Log message ... 2"
@@ -98,7 +98,7 @@ int main() {
 #include <iostream>
 #include <string>

-int main() {
+int main(void) {
        // serializes multiple objects into one message containing an array using msgpack::packer.
        msgpack::sbuffer buffer;

@@ -139,7 +139,7 @@ public:
    MSGPACK_DEFINE(m_str, m_vec);
 };

-int main() {
+int main(void) {
        std::vector<myclass> vec;
        // add some elements into vec...

@@ -147,13 +147,13 @@ int main() {
        msgpack::sbuffer sbuf;
        msgpack::pack(sbuf, vec);

-        msgpack::object_handle oh =
-            msgpack::unpack(sbuf.data(), sbuf.size());
+        msgpack::unpacked msg;
+        msgpack::unpack(&msg, sbuf.data(), sbuf.size());

-        msgpack::object obj = oh.get();
+        msgpack::object obj = msg.get();

        // you can convert object to myclass directly
        std::vector<myclass> rvec;
-        obj.convert(rvec);
+        obj.convert(&rvec);
 }
 ```
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
-`msgpack` for C++
+`msgpack` for C/C++
 ===================

-Version 4.1.2 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master)
-[![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master)
+Version 1.0.1 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c)

-It's like JSON but smaller and faster.
+It's like JSON but small and fast.

 Overview
 --------
@@ -12,19 +11,64 @@ 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 and short strings require only one extra byte in
+single byte while typical short strings require only one extra byte in
 addition to the strings themselves.

 Example
 -------

+In C:
+
+```c
+#include <msgpack.h>
+#include <stdio.h>
+
+int main(void)
+{
+    /* msgpack::sbuffer is a simple buffer implementation. */
+    msgpack_sbuffer sbuf;
+    msgpack_sbuffer_init(&sbuf);
+
+    /* serialize values into the buffer using msgpack_sbuffer_write callback function. */
+    msgpack_packer pk;
+    msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write);
+
+    msgpack_pack_array(&pk, 3);
+    msgpack_pack_int(&pk, 1);
+    msgpack_pack_true(&pk);
+    msgpack_pack_str(&pk, 7);
+    msgpack_pack_str_body(&pk, "example", 7);
+
+    /* deserialize the buffer into msgpack_object instance. */
+    /* deserialized object is valid during the msgpack_zone instance alive. */
+    msgpack_zone mempool;
+    msgpack_zone_init(&mempool, 2048);
+
+    msgpack_object deserialized;
+    msgpack_unpack(sbuf.data, sbuf.size, NULL, &mempool, &deserialized);
+
+    /* print the deserialized object. */
+    msgpack_object_print(stdout, deserialized);
+    puts("");
+
+    msgpack_zone_destroy(&mempool);
+    msgpack_sbuffer_destroy(&sbuf);
+
+    return 0;
+}
+```
+
+See [`QUICKSTART-C.md`](./QUICKSTART-C.md) for more details.
+
+In C++:
+
 ```c++
 #include <msgpack.hpp>
 #include <string>
 #include <iostream>
 #include <sstream>

-int main()
+int main(void)
 {
    msgpack::type::tuple<int, bool, std::string> src(1, true, "example");

@@ -39,11 +83,12 @@ int main()
    // deserialize the buffer into msgpack::object instance.
    std::string str(buffer.str());

-    msgpack::object_handle oh =
-        msgpack::unpack(str.data(), str.size());
+    msgpack::unpacked result;

-    // deserialized object is valid during the msgpack::object_handle instance is alive.
-    msgpack::object deserialized = oh.get();
+    msgpack::unpack(result, str.data(), str.size());
+
+    // deserialized object is valid during the msgpack::unpacked instance alive.
+    msgpack::object deserialized = result.get();

    // msgpack::object supports ostream.
    std::cout << deserialized << std::endl;
@@ -51,11 +96,7 @@ int main()
    // convert msgpack::object instance into the original type.
    // if the type is mismatched, it throws msgpack::type_error exception.
    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> >();
+    deserialized.convert(&dst);

    return 0;
 }
@@ -63,148 +104,104 @@ int main()

 See [`QUICKSTART-CPP.md`](./QUICKSTART-CPP.md) for more details.

-Dependency
----------
-
-msgpack-c requires [boost library](https://www.boost.org/).
-C++ version of msgpack-c itself is a header-only library and depends only on
-boost headers. Tests depend on boost unit test framework and are linked with
-it, so if you want to build them, you need to have this dependency installed.
-
-Experimental support for removing boost dependency
-
-For cmake:
-
-```
-cmake -DMSGPACK_USE_BOOST=OFF ..
-```
-
-NOTE: `-DMSGPACK_BUILD_TESTS=ON` doesn't work with `-DMSGPACK_USE_BOOST=OFF`.
-
-For C++ compiler
-
-```
-clang++ -DMSGPACK_NO_BOOST your_code.cpp
-```
-
-
 Usage
 -----

- If you build your project with cmake, you can find msgpack-c with a
-  canonical cmake-way:
+### C++ Header Only Library

-  ```cmake
-  # ...
-  find_package(msgpack REQUIRED)
-  # ...
-  target_link_libraries(your_target_name <PRIVATE/PUBLIC/INTERFACE> msgpackc-cxx)
-  # ...
-  ```
+When you use msgpack on C++03 and C++11, you can just add
+msgpack-c/include to your include path:

-  This will search for `msgpack` cmake package in a system prefix and in
-  prefixes from `CMAKE_PREFIX_PATH`. Note that msgpack-c depends on boost
-  headers, and `msgpack` cmake package depends on `Boost` cmake package. The
-  library is header-only and `target_link_libraries` command just adds path
-  to msgpack-c headers to your compiler's include path.
+    g++ -I msgpack-c/include your_source_file.cpp

-  A usage example can be found at [test-install](test-install) directory.
+If you want to use C version of msgpack, you need to build it. You can
+also install the C and C++ versions of msgpack.

- If you do not use cmake, you can just add path yo msgpack-c and boost
-  headers to your include path:
+### Building and Installing

-  ```bash
-  g++ -I msgpack-c/include -I path_to_boost your_source_file.cpp
-  ```
+#### Install from git repository

-Building and Installing
-----------------------
-
-### Install from git repository
-
-#### Using the Terminal (CLI)
+##### Using autotools

 You will need:

- `gcc >= 4.1.0`
- `cmake >= 3.1.0`
+ - `gcc >= 4.1.0` or `clang >= 3.3.0`
+ - `autoconf >= 2.60`
+ - `automake >= 1.10`
+ - `libtool >= 2.2.4`

-C++03:
+The build steps below are for C and C++03. If compiling for C++11,
+add `-std=c++11` to the environmental variable `CXXFLAGS` with
+`export CXXFLAGS="$CXXFLAGS -std=c++11"` prior to following the
+directions below.

 ```bash
-git clone https://github.com/msgpack/msgpack-c.git
-cd msgpack-c
-git checkout cpp_master
-cmake .
-sudo cmake --build . --target install
+$ git clone https://github.com/msgpack/msgpack-c
+$ cd msgpack-c
+$ ./bootstrap
+$ ./configure
+$ make
 ```

-If you want to build tests with different C++ version, you can use
-`MSGPACK_CXX11`, `MSGPACK_CXX14`, `MSGPACK_CXX17`, `MSGPACK_CXX20` options.
-Just replace the line
+You can install the resulting library like this:

 ```bash
-cmake .
+$ sudo make install
 ```
+##### Using cmake

-with a line like that:
+###### Using the Terminal (CLI)

-```bash
-cmake -DMSGPACK_CXX20=ON .
-```
+You will need:

-Note that these flags do not affect installation. They just switch test cases.
-All files are installed in every settings.
+ - `gcc >= 4.1.0`
+ - `cmake >= 2.8.0`

-If you don't have superuser permissions or don't want to install the library
-to a system-wide prefix, you can use `CMAKE_INSTALL_PREFIX` option like that:
+C and C++03:

-```bash
-cmake -DCMAKE_INSTALL_PREFIX=/your/custom/prefix .
-```
+    $ git clone https://github.com/msgpack/msgpack-c.git
+    $ cd msgpack-c
+    $ cmake .
+    $ make
+    $ sudo make install

-Other useful options:
+If you want to setup C++11 version of msgpack instead,
+execute the following commands:

- `MSGPACK_BUILD_TESTS` (default `OFF`): build tests
- `MSGPACK_BUILD_EXAMPLES` (default `OFF`): build examples
- `MSGPACK_32BIT` (default `OFF`): 32bit compile
- `MSGPACK_USE_X3_PARSE` (default `OFF`): use Boost X3 parse
-  (note that it requires C++14 or newer)
- `MSGPACK_CHAR_SIGN` (not set explicitly by default): char sign to use (signed or unsigned)
- `MSGPACK_USE_STATIC_BOOST` (default `OFF`): statically link with boost libraries
+    $ git clone https://github.com/msgpack/msgpack-c.git
+    $ cd msgpack-c
+    $ cmake -DMSGPACK_CXX11=ON .
+    $ sudo make install

-#### GUI on Windows
+##### GUI on Windows

-Clone msgpack-c git repository with the command:
+Clone msgpack-c git repository.

-```
-git clone https://github.com/msgpack/msgpack-c.git
-```
+    $ git clone https://github.com/msgpack/msgpack-c.git

-or using GUI git client (e.g. [tortoise git](https://code.google.com/p/tortoisegit/)).
+or using GUI git client.

-1. Checkout to `cpp_master` branch
+e.g.) tortoise git https://code.google.com/p/tortoisegit/

-2. Launch [cmake GUI client](http://www.cmake.org/cmake/resources/software.html).
+1. Launch [cmake GUI client](http://www.cmake.org/cmake/resources/software.html).

-3. Set 'Where is the source code:' text box and
-   'Where to build the binaries:' text box.
+2. Set 'Where is the source code:' text box and 'Where to build
+the binaries:' text box.

-4. Click 'Configure' button.
+3. Click 'Configure' button.

-5. Choose your Visual Studio version.
+4. Choose your Visual Studio version.

-6. Click 'Generate' button.
+5. Click 'Generate' button.

-7. Open the created msgpack.sln on Visual Studio.
+6. Open the created msgpack.sln on Visual Studio.

-8. Build all.
+7. Build all.

-Documentation
-------------
+### Documentation

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

 Contributing
 ------------
@@ -218,5 +215,5 @@ Here's the list of [great contributors](https://github.com/msgpack/msgpack-c/gra
 License
 -------

-`msgpack-c` is licensed under the Boost Software License, Version 1.0. See
-the [`LICENSE_1_0.txt`](./LICENSE_1_0.txt) file for details.
+`msgpack-c` is licensed under the Apache License Version 2.0. See
+the [`LICENSE`](./LICENSE) file for details.
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,66 +0,0 @@
-version: 4.1.2.{build}
-
-branches:
-  only:
-  - cpp_master
-
-environment:
-  matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      cpp11: -DMSGPACK_CXX11=OFF
-      msvc: '"Visual Studio 12 2013"'
-      boost_prefix: C:\Libraries\boost_1_58_0
-      boost_subdir: lib32-msvc-12.0
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      cpp11: -DMSGPACK_CXX11=OFF
-      msvc: '"Visual Studio 14 2015"'
-      boost_prefix: C:\Libraries\boost_1_69_0
-      boost_subdir: lib32-msvc-14.0
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      cpp11: -DMSGPACK_CXX11=ON
-      msvc: '"Visual Studio 14 2015"'
-      boost_prefix: C:\Libraries\boost_1_69_0
-      boost_subdir: lib32-msvc-14.0
-build_script:
-  - ps: |
-      appveyor DownloadFile http://zlib.net/zlib-1.2.12.tar.gz -FileName zlib-1.2.12.tar.gz
-      7z x zlib-1.2.12.tar.gz 2> $null
-      7z x zlib-1.2.12.tar 2> $null
-      cd zlib-1.2.12
-
-      md build
-      md prefix
-      cd build
-
-      cmake `
-          -G $env:msvc `
-          -D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.12\prefix" `
-          ..
-      if ($LastExitCode -ne 0) { exit $LastExitCode }
-
-      cmake --build . --target install --config Release
-      if ($LastExitCode -ne 0) { exit $LastExitCode }
-      cd ..\..
-
-      md build
-      md prefix
-      cd build
-
-      cmake `
-          -G $env:msvc `
-          $env:cpp11 `
-          -D MSGPACK_BUILD_EXAMPLES=ON `
-          -D MSGPACK_BUILD_TESTS=ON `
-          -D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" `
-          -D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.12\prefix" `
-          -D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" `
-          -D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /DBOOST_ALL_DYN_LINK" `
-          ..
-      if ($LastExitCode -ne 0) { exit $LastExitCode }
-
-      cmake --build . --config Release
-      if ($LastExitCode -ne 0) { exit $LastExitCode }
-
-test_script:
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.12\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
- ctest -VV -C Release
--- a/121
+++ b/121
@@ -0,0 +1,121 @@
+#!/bin/sh
+# vim:ts=4:sw=4
+# Calls autotools to build configure script and Makefile.in.
+# Generated automatically using bootstrapper 0.2.1
+# http://bootstrapper.sourceforge.net/
+#
+# Copyright (C) 2002 Anthony Ventimiglia
+#
+# This bootstrap script is free software; you can redistribute 
+# it and/or modify it under the terms of the GNU General Public 
+# License as published by the Free Software Foundation; either 
+# version 2 of the License, or (at your option) any later version.
+#
+#
+# Calls proper programs to create configure script and Makefile.in files.
+# if run with the --clean option, bootstrap removes files it generates. To
+# clean all autogenerated files (eg: for cvs imports) first run 
+# make distclean, then bootstrap --clean
+# see bootstrapper(1) for more infor
+
+
+if test x"$1" = x"--help"; then
+	echo "$0: automatic bootstrapping utility for GNU Autotools"
+	echo "		cleans up old autogenerated files and runs autoconf,"
+	echo "		automake and aclocal on local directory"
+	echo 
+	echo "		--clean		clean up auto-generated files without"
+	echo "					creating new scripts"
+	echo 
+	exit 0
+fi
+
+
+mkdir -p ac
+test -f AUTHORS   || touch AUTHORS
+test -f COPYING   || touch COPYING
+test -f ChangeLog || touch ChangeLog
+test -f NEWS      || touch NEWS
+test -f NOTICE    || touch NOTICE
+test -f README    || cp -f README.md README
+
+ACLOCAL="aclocal"
+ACLOCAL_FILES="aclocal.m4"
+ALWAYS_CLEAN="config.status config.log config.cache libtool"
+AUTOCONF="autoconf"
+AUTOCONF_FILES="configure"
+AUTOHEADER="autoheader"
+AUTOHEADER_FILES=""
+AUTOMAKE="automake --add-missing --copy"
+AUTOMAKE_FILES="config.sub stamp-h.in ltmain.sh missing mkinstalldirs install-sh config.guess"
+CONFIG_AUX_DIR="."
+CONFIG_FILES="stamp-h ltconfig"
+CONFIG_HEADER=""
+if [ x`uname` = x"Darwin" ]; then
+	LIBTOOLIZE="glibtoolize --force --copy"
+else
+	LIBTOOLIZE="libtoolize --force --copy"
+fi
+LIBTOOLIZE_FILES="config.sub ltmain.sh config.guess"
+RM="rm"
+SUBDIRS="[]"
+
+
+# These are files created by configure, so we'll always clean them
+for i in $ALWAYS_CLEAN; do
+	test -f $i && \
+	$RM $i
+done
+
+if test x"$1" = x"--clean"; then
+	#
+	#Clean Files left by previous bootstrap run
+	#
+	if test -n "$CONFIG_AUX_DIR"; 
+		then CONFIG_AUX_DIR="$CONFIG_AUX_DIR/"
+	fi
+	# Clean Libtoolize generated files
+	for cf in $LIBTOOLIZE_FILES; do
+		cf="$CONFIG_AUX_DIR$cf"
+		test -f $cf && \
+		$RM $cf
+	done
+	#aclocal.m4 created by aclocal
+	test -f $ACLOCAL_FILES && $RM $ACLOCAL_FILES
+	#Clean Autoheader Generated files
+	for cf in $AUTOHEADER_FILES; do
+		cf=$CONFIG_AUX_DIR$cf
+		test -f $cf && \
+		$RM $cf
+	done
+	# remove config header (Usaually config.h)
+	test -n "$CONFIG_HEADER" && test -f $CONFIG_HEADER && $RM $CONFIG_HEADER
+	#Clean Automake generated files
+	for cf in $AUTOMAKE_FILES; do
+		cf=$CONFIG_AUX_DIR$cf
+		test -f $cf && \
+		$RM $cf
+	done
+	for i in $SUBDIRS; do
+		test -f $i/Makefile.in && \
+		$RM $i/Makefile.in
+	done
+	#Autoconf generated files
+	for cf in $AUTOCONF_FILES; do
+		test -f $cf && \
+		$RM $cf
+	done
+	for cf in $CONFIG_FILES; do
+		cf="$CONFIG_AUX_DIR$cf"
+		test -f $cf && \
+		$RM $cf
+	done
+else
+	$LIBTOOLIZE
+	$ACLOCAL
+	$AUTOHEADER
+	$AUTOMAKE
+	$AUTOCONF
+fi
+
+
--- a/cases.json
+++ b/cases.json
@@ -0,0 +1 @@
+[false,true,null,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,127,127,255,65535,4294967295,-32,-32,-128,-32768,-2147483648,0.0,-0.0,1.0,-1.0,"a","a","a","","","",[0],[0],[0],[],[],[],{},{},{},{"a":97},{"a":97},{"a":97},[[]],[["a"]]]
--- a/cases_gen.rb
+++ b/cases_gen.rb
@@ -0,0 +1,99 @@
+#
+# MessagePack format test case
+#
+begin
+require 'rubygems'
+rescue LoadError
+end
+require 'msgpack'
+require 'json'
+
+source = <<EOF
+c2                          # false
+c3                          # true
+c0                          # nil
+00                          # 0 Positive FixNum
+cc 00                       # 0 uint8
+cd 00 00                    # 0 uint16
+ce 00 00 00 00              # 0 uint32
+cf 00 00 00 00 00 00 00 00  # 0 uint64
+d0 00                       # 0 int8
+d1 00 00                    # 0 int16
+d2 00 00 00 00              # 0 int32
+d3 00 00 00 00 00 00 00 00  # 0 int64
+ff                          # -1 Negative FixNum
+d0 ff                       # -1 int8
+d1 ff ff                    # -1 int16
+d2 ff ff ff ff              # -1 int32
+d3 ff ff ff ff ff ff ff ff  # -1 int64
+7f                          # 127 Positive FixNum
+cc 7f                       # 127 uint8
+cd 00 ff                    # 255 uint16
+ce 00 00 ff ff              # 65535 uint32
+cf 00 00 00 00 ff ff ff ff  # 4294967295 uint64
+e0                          # -32 Negative FixNum
+d0 e0                       # -32 int8
+d1 ff 80                    # -128 int16
+d2 ff ff 80 00              # -32768 int32
+d3 ff ff ff ff 80 00 00 00  # -2147483648 int64
+#ca 00 00 00 00              # 0.0 float
+cb 00 00 00 00 00 00 00 00  # 0.0 double
+#ca 80 00 00 00              # -0.0 float
+cb 80 00 00 00 00 00 00 00  # -0.0 double
+cb 3f f0 00 00 00 00 00 00  # 1.0 double
+cb bf f0 00 00 00 00 00 00  # -1.0 double
+a1 61                       # "a" FixRaw
+da 00 01 61                 # "a" raw 16
+db 00 00 00 01 61           # "a" raw 32
+a0                          # "" FixRaw
+da 00 00                    # "" raw 16
+db 00 00 00 00              # "" raw 32
+91 00                       # [0] FixArray
+dc 00 01 00                 # [0] array 16
+dd 00 00 00 01 00           # [0] array 32
+90                          # [] FixArray
+dc 00 00                    # [] array 16
+dd 00 00 00 00              # [] array 32
+80                          # {} FixMap
+de 00 00                    # {} map 16
+df 00 00 00 00              # {} map 32
+81 a1 61 61                 # {"a"=>97} FixMap
+de 00 01 a1 61 61           # {"a"=>97} map 16
+df 00 00 00 01 a1 61 61     # {"a"=>97} map 32
+91 90                       # [[]]
+91 91 a1 61                 # [["a"]]
+EOF
+
+source.gsub!(/\#.+$/,'')
+bytes = source.strip.split(/\s+/).map {|x| x.to_i(16) }.pack('C*')
+
+objs = []
+compact_bytes = ""
+
+pac = MessagePack::Unpacker.new
+pac.feed(bytes)
+pac.each {|obj|
+	p obj
+	objs << obj
+	compact_bytes << obj.to_msgpack
+}
+
+json = objs.to_json
+
+# self check
+cpac = MessagePack::Unpacker.new
+cpac.feed(compact_bytes)
+cpac.each {|cobj|
+	obj = objs.shift
+	if obj != cobj
+		puts "** SELF CHECK FAILED **"
+		puts "expected: #{obj.inspect}"
+		puts "actual: #{cobj.inspect}"
+		exit 1
+	end
+}
+
+File.open("cases.mpac","w") {|f| f.write(bytes) }
+File.open("cases_compact.mpac","w") {|f| f.write(compact_bytes) }
+File.open("cases.json","w") {|f| f.write(json) }
+
--- a/ci/build_autotools.sh
+++ b/ci/build_autotools.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+./bootstrap
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+if [ $1 = "cpp11" ]
+then
+    if [ $2 = "32" ]
+    then
+        ./configure CFLAGS="-m32" CXXFLAGS="-std=c++11 -m32"
+    else
+        ./configure CXXFLAGS="-std=c++11"
+    fi
+else
+    if [ $2 = "32" ]
+    then
+        ./configure CFLAGS="-m32" CXXFLAGS="-m32"
+    else
+        ./configure
+    fi
+fi
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make check
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make install DESTDIR=`pwd`/install
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+exit 0
--- a/ci/build_cmake.sh
+++ b/ci/build_cmake.sh
@@ -1,37 +1,71 @@
 #!/bin/bash

-build_dir="$CXX-build"
-prefix_dir="`pwd`/$CXX-prefix"
-mkdir $build_dir  || exit 1
-mkdir $prefix_dir || exit 1
+mkdir build

-if [ "${ARCH}" == "32" ]; then
-    export BIT32="ON"
-    export ARCH_FLAG="-m32"
-else
-    export BIT32="OFF"
-    export ARCH_FLAG="-m64"
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
 fi

-cmake \
-    -D CMAKE_PREFIX_PATH="${HOME}/boost-prefix/${ARCH};${HOME}/zlib-prefix/${ARCH}" \
-    -D MSGPACK_BUILD_TESTS=ON \
-    -D ${MSGPACK_CXX_VERSION} \
-    -D MSGPACK_32BIT=${BIT32} \
-    -D MSGPACK_CHAR_SIGN=${CHAR_SIGN} \
-    -D MSGPACK_DEFAULT_API_VERSION=${API_VERSION} \
-    -D MSGPACK_USE_X3_PARSE=${X3_PARSE} \
-    -D CMAKE_CXX_FLAGS="${CXXFLAGS} ${ARCH_FLAG}" \
-    -D CMAKE_INSTALL_PREFIX=$prefix_dir \
-    -B $build_dir \
-    -S . || exit 1
+cd build

-cmake --build $build_dir --target install || exit 1
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi

-ctest -VV --test-dir $build_dir || exit 1
+if [ $1 = "cpp11" ]
+then
+    if [ $2 = "32" ]
+    then
+        cmake -DMSGPACK_CXX11=ON -DMSGPACK_32BIT=ON ..
+    else
+        cmake -DMSGPACK_CXX11=ON ..
+    fi
+else
+    if [ $2 = "32" ]
+    then
+        cmake -DMSGPACK_32BIT=ON ..
+    else
+        cmake ..
+    fi
+fi

-if [ "${ARCH}" != "32" ] && [ `uname` = "Linux" ]; then
-    ctest -T memcheck --test-dir $build_dir | tee memcheck.log
+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
+
+make install DESTDIR=`pwd`/install
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+if [ $2 != "32" ]
+then
+    ctest -T memcheck | tee memcheck.log

    ret=${PIPESTATUS[0]}
    if [ $ret -ne 0 ]
@@ -46,15 +80,4 @@ if [ "${ARCH}" != "32" ] && [ `uname` = "Linux" ]; then
    fi
 fi

-if [ "${ARCH}" != "32" ]; then
-    cd test-install || exit 1
-
-    mkdir $build_dir
-    cmake \
-        -D CMAKE_PREFIX_PATH="$prefix_dir;${HOME}/boost-prefix/${ARCH}" \
-        -B $build_dir \
-        -S . || exit 1
-    cmake --build $build_dir --target all || exit 1
-
-    $build_dir/test-install || exit 1
-fi
+exit 0
--- a/ci/build_regression.sh
+++ b/ci/build_regression.sh
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-build_dir="$CXX-build"
-mkdir $build_dir || exit 1
-
-if [ "${ARCH}" == "32" ]
-then
-    echo "64 bit support required for regressions"
-    exit 1
-fi
-
-cmake \
-    -D CMAKE_PREFIX_PATH="${HOME}/boost-prefix/${ARCH};${HOME}/zlib-prefix/${ARCH}" \
-    -D MSGPACK_FUZZ_REGRESSION="ON" \
-    -D ${MSGPACK_CXX_VERSION} \
-    -D MSGPACK_CHAR_SIGN=${CHAR_SIGN} \
-    -D MSGPACK_DEFAULT_API_VERSION=${API_VERSION} \
-    -D MSGPACK_USE_X3_PARSE=${X3_PARSE} \
-    -D CMAKE_CXX_FLAGS="${CXXFLAGS}" \
-    -B $build_dir \
-    -S . || exit 1
-
-cmake --build $build_dir --target all || exit 1
-
-ctest -VV --test-dir $build_dir || exit 1
--- a/ci/set_gcc_10.sh
+++ b/ci/set_gcc_10.sh
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-version=10
-priority=100
-
-sudo update-alternatives --install /usr/bin/gcc         gcc         /usr/bin/gcc-${version}         ${priority}
-sudo update-alternatives --install /usr/bin/gcc-ar      gcc-ar      /usr/bin/gcc-ar-${version}      ${priority}
-sudo update-alternatives --install /usr/bin/gcc-nm      gcc-nm      /usr/bin/gcc-nm-${version}      ${priority}
-sudo update-alternatives --install /usr/bin/gcc-ranlib  gcc-ranlib  /usr/bin/gcc-ranlib-${version}  ${priority}
-sudo update-alternatives --install /usr/bin/gcov        gcov        /usr/bin/gcov-${version}        ${priority}
-sudo update-alternatives --install /usr/bin/gcov-dump   gcov-dump   /usr/bin/gcov-dump-${version}   ${priority}
-sudo update-alternatives --install /usr/bin/gcov-tool   gcov-tool   /usr/bin/gcov-tool-${version}   ${priority}
-sudo update-alternatives --install /usr/bin/lto-dump    lto-dump    /usr/bin/lto-dump-${version}    ${priority}
-sudo update-alternatives --install /usr/bin/g++         g++         /usr/bin/g++-${version}         ${priority}
-
-sudo update-alternatives --install /usr/bin/cc   cc   /usr/bin/gcc-${version} ${priority}
-sudo update-alternatives --install /usr/bin/c++  c++  /usr/bin/g++-${version} ${priority}
--- a/cmake/CodeCoverage.cmake
+++ b/cmake/CodeCoverage.cmake
@@ -1,55 +0,0 @@
-# Check prereqs
-FIND_PROGRAM(GCOV_PATH gcov)
-FIND_PROGRAM(LCOV_PATH lcov)
-FIND_PROGRAM(GENHTML_PATH genhtml)
-
-IF(NOT GCOV_PATH)
-    MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
-ENDIF()
-
-IF(NOT CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_COMPILER_IS_GNUCXX)
-    # Clang version 3.0.0 and greater now supports gcov as well.
-    MESSAGE(STATUS "Compiler is not GNU gcc! Clang Version 3.0.0 and greater supports gcov as well, but older versions don't.")
-    IF(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "Clang" AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-        MESSAGE(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
-    ENDIF()
-ENDIF()
-
-SET(COVERAGE_FLAGS "-g -O0 --coverage")
-
-FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
-
-    IF(NOT LCOV_PATH)
-        MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
-    ENDIF()
-
-    IF(NOT GENHTML_PATH)
-        MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
-    ENDIF()
-
-    # Setup target
-    ADD_CUSTOM_TARGET(${_targetname}
-
-        # Cleanup lcov
-        ${LCOV_PATH} --directory . --zerocounters
-
-        # Run tests
-        COMMAND ${_testrunner} ${ARGV3}
-
-        # Capturing lcov counters and generating report
-        COMMAND ${LCOV_PATH} --directory . --capture --output-file ${_outputname}.info --base-directory ${CMAKE_SOURCE_DIR} --no-external --quiet
-        COMMAND ${LCOV_PATH} --remove ${_outputname}.info '*/test/*' '*/fuzz/*' --output-file ${_outputname}.info.cleaned --quiet
-        COMMAND ${GENHTML_PATH} -o ${_outputname} ${_outputname}.info.cleaned --prefix ${CMAKE_SOURCE_DIR}
-        # COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info ${_outputname}.info.cleaned
-
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
-    )
-
-    # Show info where to find the report
-    ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-        COMMAND ;
-        COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
-    )
-
-ENDFUNCTION()
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,36 +0,0 @@
-codecov:
-  notify:
-    require_ci_to_pass: yes
-
-coverage:
-  precision: 2
-  round: down
-  range: "70...100"
-
-  status:
-    project: yes
-    patch: yes
-    changes: no
-
-parsers:
-  gcov:
-    branch_detection:
-      conditional: yes
-      loop: yes
-      method: no
-      macro: no
-
-comment:
-  layout: "header, diff"
-  behavior: default
-  require_changes: no
-
-ignore:
-  - "test"
-  - "fuzz"
-  - "erb"
-  - "ci"
-  - "cmake"
-  - "examle"
-  - "external"
-  - "usr"
--- a/configure.in
+++ b/configure.in
@@ -0,0 +1,98 @@
+AC_INIT(msgpack, m4_esyscmd([cat include/msgpack/version_master.h | tr -d "\n" | sed -e 's/#define MSGPACK_VERSION_MAJOR[[:space:]]*\([[:alnum:]]*\)/\1./g' -e 's/#define MSGPACK_VERSION_MINOR[[:space:]]*\([[:alnum:]]*\)/\1./g' -e 's/#define MSGPACK_VERSION_REVISION[[:space:]]*\([[:alnum:]]*\)/\1/g' | tr -d "\n"]))
+AC_CONFIG_AUX_DIR(ac)
+AM_INIT_AUTOMAKE
+AC_CONFIG_HEADER(config.h)
+AC_SUBST(CFLAGS)
+CFLAGS="-O3 -Wall $CFLAGS"
+
+AC_SUBST(CXXFLAGS)
+CXXFLAGS="-O3 -Wall $CXXFLAGS"
+
+
+AC_PROG_CC
+
+
+AC_MSG_CHECKING([if C++ API is enabled])
+AC_ARG_ENABLE(cxx,
+	AS_HELP_STRING([--disable-cxx],
+				   [don't build C++ API]) )   #'
+AC_MSG_RESULT([$enable_cxx])
+if test "$enable_cxx" != "no"; then
+	AC_PROG_CXX
+	AM_PROG_CC_C_O
+fi
+AM_CONDITIONAL(ENABLE_CXX, test "$enable_cxx" != "no")
+
+
+AC_PROG_LIBTOOL
+AM_PROG_AS
+
+
+AC_MSG_CHECKING([if debug option is enabled])
+AC_ARG_ENABLE(debug,
+	AS_HELP_STRING([--disable-debug],
+				   [disable assert macros and omit -g option]) )
+AC_MSG_RESULT([$enable_debug])
+if test "$enable_debug" != "no"; then
+	CXXFLAGS="$CXXFLAGS -g"
+	CFLAGS="$CFLAGS -g"
+else
+	CXXFLAGS="$CXXFLAGS -DNDEBUG"
+	CFLAGS="$CFLAGS -DNDEBUG"
+fi
+
+
+AC_CACHE_CHECK([for __sync_* atomic operations], msgpack_cv_atomic_ops, [
+	AC_TRY_LINK([
+		int atomic_sub(int i) { return __sync_sub_and_fetch(&i, 1); }
+		int atomic_add(int i) { return __sync_add_and_fetch(&i, 1); }
+	], [atomic_sub(1); atomic_add(1);], msgpack_cv_atomic_ops="yes")
+	])
+if test "$msgpack_cv_atomic_ops" != "yes"; then
+	if test "$enable_cxx" = "no"; then
+		AC_MSG_ERROR([__sync_* atomic operations are not found. Try to enable C++ support.
+If you are using gcc >= 4.1 and the default target CPU architecture is "i386", try to
+add CFLAGS="-march=i686" and CXXFLAGS="-march=i686" options to ./configure as follows:
+
+  $ ./configure CFLAGS="-march=i686" CXXFLAGS="-march=i686"
+					  ])
+	fi
+
+	AC_LANG_PUSH([C++])
+	AC_CACHE_CHECK([for __gnu_cxx::__exchange_and_add], msgpack_cv_gcc_cxx_atomic_ops, [
+		AC_TRY_LINK([
+			#include <bits/atomicity.h>
+			int atomic_sub(int i) { return __gnu_cxx::__exchange_and_add(&i, -1) - 1; }
+			int atomic_add(int i) { return __gnu_cxx::__exchange_and_add(&i, 1) + 1; }
+		], [atomic_sub(1); atomic_add(1);], msgpack_cv_gcc_cxx_atomic_ops="yes")
+		])
+	AC_LANG_POP([C++])
+
+	if test "$msgpack_cv_gcc_cxx_atomic_ops" != "yes"; then
+		AC_MSG_ERROR([__sync_* atomic operations nor __gnu_cxx::__exchange_and_add are not found.
+
+If you are using gcc >= 4.1 and the default target CPU architecture is "i386", try to
+add CFLAGS="-march=i686" and CXXFLAGS="-march=i686" options to ./configure as follows:
+
+  $ ./configure CFLAGS="-march=i686" CXXFLAGS="-march=i686"
+])
+
+	else
+		enable_gcc_cxx_atomic=yes
+	fi
+fi
+
+AM_CONDITIONAL(ENABLE_GCC_CXX_ATOMIC, test "$enable_gcc_cxx_atomic" = "yes")
+
+major=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+minor=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+revision=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+AC_SUBST(VERSION_MAJOR, $major)
+AC_SUBST(VERSION_MINOR, $minor)
+AC_SUBST(VERSION_REVISION, $revision)
+
+
+AC_OUTPUT([Makefile
+		   msgpack.pc
+		   src/Makefile
+		   test/Makefile])
--- a/crosslang.cc
+++ b/crosslang.cc
@@ -0,0 +1,133 @@
+//
+// MessagePack cross-language test tool
+//
+// $ cd ../cpp && ./configure && make && make install
+// or
+// $ port install msgpack  # MacPorts
+//
+// $ g++ -Wall crosslang.cc -lmsgpack
+//
+#include <msgpack.hpp>
+#include <iostream>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+static int run(int infd, int outfd)
+try {
+	msgpack::unpacker pac;
+
+	while(true) {
+		pac.reserve_buffer(32*1024);
+
+		ssize_t count =
+			read(infd, pac.buffer(), pac.buffer_capacity());
+
+		if(count <= 0) {
+			if(count == 0) {
+				return 0;
+			}
+			if(errno == EAGAIN || errno == EINTR) {
+				continue;
+			}
+			return 1;
+		}
+
+		pac.buffer_consumed(count);
+
+		msgpack::unpacked result;
+		while(pac.next(&result)) {
+			msgpack::sbuffer sbuf;
+			msgpack::pack(sbuf, result.get());
+
+			const char* p = sbuf.data();
+			const char* const pend = p + sbuf.size();
+			while(p < pend) {
+				ssize_t bytes = write(outfd, p, pend-p);
+
+				if(bytes <= 0) {
+					if(count == 0) {
+						return 0;
+					}
+					if(errno == EAGAIN || errno == EINTR) {
+						continue;
+					}
+					return 1;
+				}
+
+				p += bytes;
+			}
+
+		}
+	}
+
+	return 0;
+
+} catch (std::exception& e) {
+	std::cerr << e.what() << std::endl;
+	return 1;
+}
+
+static void usage(const char* prog)
+{
+	printf(
+		"Usage: %s [in-file] [out-file]\n"
+		"\n"
+		"This tool is for testing of MessagePack implementation.\n"
+		"This does following behavior:\n"
+		"\n"
+		"  1. Reads objects serialized by MessagePack from <in-file> (default: stdin)\n"
+		"  2. Re-serializes the objects using C++ implementation of MessagePack (Note that C++ implementation is considered valid)\n"
+		"  3. Writes the re-serialized objects into <out-file> (default: stdout)\n"
+		"\n"
+		, prog);
+	exit(1);
+}
+
+int main(int argc, char* argv[])
+{
+	int infd = 0;
+	int outfd = 1;
+
+	if(argc < 1 || argc > 3) {
+		usage(argv[0]);
+	}
+
+	for(int i=1; i < argc; ++i) {
+		if(strlen(argv[i]) > 1 && argv[i][0] == '-') {
+			usage(argv[0]);
+		}
+	}
+
+	if(argc >= 2) {
+		const char* fname = argv[1];
+		if(strcmp(fname, "-") != 0) {
+			infd = open(fname, O_RDONLY);
+			if(infd < 0) {
+				perror("can't open input file");
+				exit(1);
+			}
+		}
+	}
+
+	if(argc >= 3) {
+		const char* fname = argv[2];
+		if(strcmp(fname, "-") != 0) {
+			outfd = open(fname, O_WRONLY | O_CREAT| O_TRUNC, 0666);
+			if(outfd < 0) {
+				perror("can't open output file");
+				exit(1);
+			}
+		}
+	}
+
+	int code = run(infd, outfd);
+
+	close(infd);
+	close(outfd);
+
+	return code;
+}
+
--- a/crosslang.rb
+++ b/crosslang.rb
@@ -0,0 +1,88 @@
+#
+# MessagePack cross-language test tool
+#
+# $ gem install msgpack
+# or
+# $ port install rb_msgpack   # MacPorts
+#
+begin
+require 'rubygems'
+rescue LoadError
+end
+require 'msgpack'
+
+def run(inio, outio)
+	pac = MessagePack::Unpacker.new(inio)
+
+	begin
+		pac.each {|obj|
+			outio.write MessagePack.pack(obj)
+			outio.flush
+		}
+	rescue EOFError
+		return 0
+	rescue
+		$stderr.puts $!
+		return 1
+	end
+
+	return 0
+end
+
+def usage
+	puts <<EOF
+Usage: #{$0} [in-file] [out-file]
+
+This tool is for testing of MessagePack implementation.
+This does following behavior:
+
+  1. Reads objects serialized by MessagePack from <in-file> (default: stdin)
+  2. Re-serializes the objects using Ruby implementation of MessagePack (Note that Ruby implementation is considered valid)
+  3. Writes the re-serialized objects into <out-file> (default: stdout)
+
+EOF
+	exit 1
+end
+
+inio = $stdin
+outio = $stdout
+
+if ARGV.length > 2
+	usage
+end
+
+ARGV.each {|str|
+	if str.size > 1 && str[0] == ?-
+		usage
+	end
+}
+
+if fname = ARGV[0]
+	unless fname == "-"
+		begin
+			inio = File.open(fname)
+		rescue
+			puts "can't open output file: #{$!}"
+			exit 1
+		end
+	end
+end
+
+if fname = ARGV[1]
+	unless fname == "-"
+		begin
+			outio = File.open(fname, "w")
+		rescue
+			puts "can't open output file: #{$!}"
+			exit 1
+		end
+	end
+end
+
+code = run(inio, outio)
+
+inio.close
+outio.close
+
+exit code
+
--- a/erb/cpp03_define.hpp.erb
+++ b/erb/cpp03_define.hpp.erb
@@ -0,0 +1,158 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2008-2009 FURUHASHI Sadayuki
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+#ifndef MSGPACK_CPP03_DEFINE_HPP
+#define MSGPACK_CPP03_DEFINE_HPP
+
+#include "msgpack/versioning.hpp"
+#include "msgpack/adaptor/msgpack_tuple_fwd.hpp"
+#include "msgpack/adaptor/int_fwd.hpp"
+#include "msgpack/object_fwd.hpp"
+
+#define MSGPACK_DEFINE(...) \
+    template <typename Packer> \
+    void msgpack_pack(Packer& pk) const \
+    { \
+        msgpack::type::make_define(__VA_ARGS__).msgpack_pack(pk); \
+    } \
+    void msgpack_unpack(msgpack::object const& o) \
+    { \
+        msgpack::type::make_define(__VA_ARGS__).msgpack_unpack(o); \
+    }\
+    template <typename MSGPACK_OBJECT> \
+    void msgpack_object(MSGPACK_OBJECT* o, msgpack::zone& z) const \
+    { \
+        msgpack::type::make_define(__VA_ARGS__).msgpack_object(o, z); \
+    }
+
+// MSGPACK_ADD_ENUM must be used in the global namespace.
+#define MSGPACK_ADD_ENUM(enum) \
+  namespace msgpack { \
+  MSGPACK_API_VERSION_NAMESPACE(v1) { \
+    inline msgpack::object const& operator>> (msgpack::object const& o, enum& v) \
+    { \
+      int tmp; \
+      o >> tmp; \
+      v = static_cast<enum>(tmp); \
+      return o; \
+    } \
+    inline void operator<< (msgpack::object& o, const enum& v) \
+    { \
+      o << static_cast<int>(v); \
+    } \
+    inline void operator<< (msgpack::object::with_zone& o, const enum& v) \
+    { \
+      o << static_cast<int>(v); \
+    } \
+    namespace detail { \
+      template <typename Stream> \
+      struct packer_serializer<Stream, enum> { \
+        static msgpack::packer<Stream>& pack(msgpack::packer<Stream>& o, const enum& v) { \
+          return o << static_cast<int>(v); \
+        } \
+      }; \
+    } \
+  } \
+  }
+
+namespace msgpack {
+MSGPACK_API_VERSION_NAMESPACE(v1) {
+namespace type {
+
+
+<% GENERATION_LIMIT = 31 %>
+template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
+struct define;
+
+
+template <>
+struct define<> {
+    typedef define<> value_type;
+    typedef tuple<> tuple_type;
+    template <typename Packer>
+    void msgpack_pack(Packer& pk) const
+    {
+        pk.pack_array(0);
+    }
+    void msgpack_unpack(msgpack::object const& o)
+    {
+        if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
+    }
+    void msgpack_object(msgpack::object* o, msgpack::zone&) const
+    {
+        o->type = msgpack::type::ARRAY;
+        o->via.array.ptr = nullptr;
+        o->via.array.size = 0;
+    }
+};
+<%0.upto(GENERATION_LIMIT) {|i|%>
+template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+struct define<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
+    typedef define<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> value_type;
+    typedef tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> tuple_type;
+    define(A0& _a0<%1.upto(i) {|j|%>, A<%=j%>& _a<%=j%><%}%>) :
+        a0(_a0)<%1.upto(i) {|j|%>, a<%=j%>(_a<%=j%>)<%}%> {}
+    template <typename Packer>
+    void msgpack_pack(Packer& pk) const
+    {
+        pk.pack_array(<%=i+1%>);
+        <%0.upto(i) {|j|%>
+        pk.pack(a<%=j%>);<%}%>
+    }
+    void msgpack_unpack(msgpack::object const& o)
+    {
+        if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
+        const size_t size = o.via.array.size;
+        if(size > 0) {
+            msgpack::object *ptr = o.via.array.ptr;
+            switch(size) {
+            default:<%(i).downto(0) {|j|%>
+            case <%=j+1%>: ptr[<%=j%>].convert(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.size = <%=i+1%>;
+        <%0.upto(i) {|j|%>
+        o->via.array.ptr[<%=j%>] = msgpack::object(a<%=j%>, z);<%}%>
+    }
+    <%0.upto(i) {|j|%>
+    A<%=j%>& a<%=j%>;<%}%>
+};
+<%}%>
+
+inline define<> make_define()
+{
+    return define<>();
+}
+<%0.upto(GENERATION_LIMIT) {|i|%>
+template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+define<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_define(A0& a0<%1.upto(i) {|j|%>, A<%=j%>& a<%=j%><%}%>)
+{
+    return define<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>(a0<%1.upto(i) {|j|%>, a<%=j%><%}%>);
+}
+<%}%>
+
+}  // namespace type
+}  // MSGPACK_API_VERSION_NAMESPACE(v1)
+}  // namespace msgpack
+
+
+#endif // MSGPACK_CPP03_DEFINE_HPP
--- a/erb/v1/cpp03_msgpack_tuple.hpp.erb
+++ b/erb/v1/cpp03_msgpack_tuple.hpp.erb
@@ -1,22 +1,29 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2008-2016 FURUHASHI Sadayuki and KONDO Takatoshi
+// Copyright (C) 2008-2013 FURUHASHI Sadayuki and 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
 //
-#ifndef MSGPACK_V1_CPP03_MSGPACK_TUPLE_HPP
-#define MSGPACK_V1_CPP03_MSGPACK_TUPLE_HPP
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+#ifndef MSGPACK_CPP03_MSGPACK_TUPLE_HPP
+#define MSGPACK_CPP03_MSGPACK_TUPLE_HPP

-#include "msgpack/v1/adaptor/msgpack_tuple_decl.hpp"
+#include "msgpack/versioning.hpp"
+#include "msgpack/object.hpp"

 namespace msgpack {

-/// @cond
 MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond

 namespace type {

@@ -24,6 +31,15 @@ namespace type {
 // FIXME operator!=
 <% GENERATION_LIMIT = 31 %>

+template <typename A0<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%><%}%>>
+struct tuple;
+
+template <typename Tuple, int N>
+struct tuple_element;
+
+template <typename Tuple, int N>
+struct const_tuple_element;
+
 template <typename T>
 struct tuple_type {
    typedef T type;
@@ -51,7 +67,6 @@ struct tuple_type<const T&> {
    typedef const T& transparent_reference;
 };

-/// @cond
 <%0.upto(GENERATION_LIMIT) {|i|%>
 <%0.upto(i) {|j|%>
 template <typename A0<%1.upto(i) {|k|%>, typename A<%=k%><%}%>>
@@ -76,22 +91,17 @@ private:
 };
 <%}%>
 <%}%>
-/// @endcond

 template <>
 struct tuple<> {
    tuple() {}
    tuple(msgpack::object const& o) { o.convert(*this); }
    typedef tuple<> value_type;
-    std::size_t size() const { return 0; }
 };
-
-/// @cond
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
 struct tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
    typedef tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> value_type;
-    std::size_t size() const { return <%=i+1%>; }
    tuple() {}
    tuple(typename tuple_type<A0>::transparent_reference _a0<%1.upto(i) {|j|%>, typename tuple_type<A<%=j%>>::transparent_reference _a<%=j%><%}%>) :
        a0(_a0)<%1.upto(i) {|j|%>, a<%=j%>(_a<%=j%>)<%}%> {}
@@ -111,117 +121,96 @@ template <int N, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
 inline typename type::const_tuple_element<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>, N>::const_reference get(type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> const& t)
 { return t.template get<N>(); }
 <%}%>
-/// @endcond

 inline tuple<> make_tuple()
 {
    return 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(A0 const& a0<%1.upto(i) {|j|%>, A<%=j%> const& 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%><%}%>)
 {
    return tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>(a0<%1.upto(i) {|j|%>, a<%=j%><%}%>);
 }
 <%}%>
-/// @endcond

 }  // namespace type

-namespace adaptor {
-
-template <>
-struct convert<type::tuple<> > {
-    msgpack::object const& operator()(
+inline msgpack::object const& operator>> (
        msgpack::object const& o,
-        type::tuple<>&) const {
-        if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
-        return o;
-    }
-};
-
-/// @cond
+        type::tuple<>&) {
+    if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
+    return o;
+}
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-struct convert<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> > {
-    msgpack::object const& operator()(
+inline msgpack::object const& operator>> (
        msgpack::object const& o,
-        type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v) const {
-        if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
-        <%0.upto(i) {|j|%>
-        // In order to avoid clang++'s invalid warning, msgpack::object:: has been added.
-        if(o.via.array.size > <%=j%>)
-            o.via.array.ptr[<%=j%>].msgpack::object::convert<typename type::tuple_type<A<%=j%>>::type>(v.template get<<%=j%>>());<%}%>
-        return o;
-    }
-};
+        type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v) {
+    if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
+    if(o.via.array.size < <%=i+1%>) { throw msgpack::type_error(); }
+    <%0.upto(i) {|j|%>
+    o.via.array.ptr[<%=j%>].convert<typename type::tuple_type<A<%=j%>>::type>(v.template get<<%=j%>>());<%}%>
+    return o;
+}
 <%}%>
-/// @endcond

-template <>
-struct pack<type::tuple<> > {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(
+template <typename Stream>
+inline const msgpack::packer<Stream>& operator<< (
        msgpack::packer<Stream>& o,
-        const type::tuple<>&) const {
-        o.pack_array(0);
-        return o;
-    }
-};
+        const type::tuple<>&) {
+    o.pack_array(0);
+    return o;
+}
+<%0.upto(GENERATION_LIMIT) {|i|%>
+template <typename Stream, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
+        const type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v) {
+    o.pack_array(<%=i+1%>);
+    <%0.upto(i) {|j|%>
+    o.pack(v.template get<<%=j%>>());<%}%>
+    return o;
+}
+<%}%>

-/// @cond
+inline void operator<< (
+        msgpack::object::with_zone& o,
+        const type::tuple<>&) {
+    o.type = msgpack::type::ARRAY;
+    o.via.array.ptr = nullptr;
+    o.via.array.size = 0;
+}
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-struct pack<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> > {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(
-        msgpack::packer<Stream>& o,
-        const type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v) const {
-        o.pack_array(<%=i+1%>);
-        <%0.upto(i) {|j|%>
-        o.pack(v.template get<<%=j%>>());<%}%>
-        return o;
-    }
-};
-<%}%>
-/// @endcond
-
-template <>
-struct object_with_zone<type::tuple<> > {
-    void operator()(
+inline void operator<< (
        msgpack::object::with_zone& o,
-        const type::tuple<>&) const {
-        o.type = msgpack::type::ARRAY;
-        o.via.array.ptr = MSGPACK_NULLPTR;
-        o.via.array.size = 0;
-    }
-};
-
-/// @cond
-<%0.upto(GENERATION_LIMIT) {|i|%>
-template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-struct object_with_zone<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> > {
-    void operator()(
-        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%>, 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);<%}%>
-    }
-};
+        const type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v) {
+    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.size = <%=i+1%>;
+    <%0.upto(i) {|j|%>
+    o.via.array.ptr[<%=j%>] = msgpack::object(v.template get<<%=j%>>(), o.zone);<%}%>
+}
 <%}%>
-/// @endcond

-} // namespace adaptor
-
-/// @cond
 }  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond

 }  // namespace msgpack

-#endif // MSGPACK_V1_CPP03_MSGPACK_TUPLE_HPP
+
+//inline std::ostream& operator<< (std::ostream& o, const msgpack::type::tuple<>& v) {
+//  return o << "[]";
+//}
+//<%0.upto(GENERATION_LIMIT) {|i|%>
+//template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+//inline std::ostream& operator<< (std::ostream& o,
+//      const msgpack::type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v) {
+//  return o << "["
+//  <%0.upto(i) {|j|%>
+//  <<<%if j != 0 then%> ", " <<<%end%> v.template get<<%=j%>>()<%}%>
+//  << "]";
+//}
+//<%}%>
+
+#endif // MSGPACK_CPP03_MSGPACK_TUPLE_HPP
--- a/erb/cpp03_msgpack_tuple_fwd.hpp.erb
+++ b/erb/cpp03_msgpack_tuple_fwd.hpp.erb
@@ -0,0 +1,125 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2008-2013 FURUHASHI Sadayuki and KONDO Takatoshi
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+#ifndef MSGPACK_CPP03_MSGPACK_TUPLE_FWD_HPP
+#define MSGPACK_CPP03_MSGPACK_TUPLE_FWD_HPP
+
+#include "msgpack/versioning.hpp"
+#include "msgpack/object_fwd.hpp"
+
+namespace msgpack {
+
+MSGPACK_API_VERSION_NAMESPACE(v1) {
+
+namespace type {
+
+// FIXME operator==
+// FIXME operator!=
+<% GENERATION_LIMIT = 31 %>
+
+template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
+struct tuple;
+
+template <typename Tuple, int N>
+struct tuple_element;
+
+template <typename Tuple, int N>
+struct const_tuple_element;
+
+template <typename T>
+struct tuple_type;
+
+<%0.upto(GENERATION_LIMIT) {|i|%>
+<%0.upto(i) {|j|%>
+template <typename A0<%1.upto(i) {|k|%>, typename A<%=k%><%}%>>
+struct tuple_element<tuple<A0<%1.upto(i) {|k|%>, A<%=k%><%}%>>, <%=j%>>;
+<%}%>
+<%}%>
+
+<%0.upto(GENERATION_LIMIT) {|i|%>
+<%0.upto(i) {|j|%>
+template <typename A0<%1.upto(i) {|k|%>, typename A<%=k%><%}%>>
+struct const_tuple_element<tuple<A0<%1.upto(i) {|k|%>, A<%=k%><%}%>>, <%=j%>>;
+<%}%>
+<%}%>
+
+template <>
+struct tuple<>;
+<%0.upto(GENERATION_LIMIT) {|i|%>
+template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+struct tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>;
+
+template <int N, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+typename type::tuple_element<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>, N>::reference get(type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& t);
+template <int N, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+typename type::const_tuple_element<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>, N>::const_reference get(type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> const& t);
+<%}%>
+
+tuple<> make_tuple();
+<%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%><%}%>);
+<%}%>
+
+}  // namespace type
+
+msgpack::object const& operator>> (
+    msgpack::object const& o,
+    type::tuple<>&);
+
+<%0.upto(GENERATION_LIMIT) {|i|%>
+template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+msgpack::object const& operator>> (
+    msgpack::object const& o,
+    type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v);
+<%}%>
+
+template <typename Stream>
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
+    const type::tuple<>&);
+
+<%0.upto(GENERATION_LIMIT) {|i|%>
+template <typename Stream, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
+    const type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v);
+<%}%>
+
+void operator<< (
+    msgpack::object::with_zone& o,
+    const type::tuple<>&);
+<%0.upto(GENERATION_LIMIT) {|i|%>
+template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+void operator<< (
+    msgpack::object::with_zone& o,
+    const type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v);
+<%}%>
+
+}  // MSGPACK_API_VERSION_NAMESPACE(v1)
+
+}  // namespace msgpack
+
+
+//std::ostream& operator<< (std::ostream& o, const msgpack::type::tuple<>& v);
+//<%0.upto(GENERATION_LIMIT) {|i|%>
+//template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
+//std::ostream& operator<< (std::ostream& o,
+//      const msgpack::type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v);
+//<%}%>
+
+#endif // MSGPACK_CPP03_MSGPACK_TUPLE_FWD_HPP
--- a/erb/v1/cpp03_zone.hpp.erb
+++ b/erb/v1/cpp03_zone.hpp.erb
@@ -1,31 +1,41 @@
 //
 // MessagePack for C++ memory pool
 //
-// Copyright (C) 2008-2016 FURUHASHI Sadayuki and KONDO Takatoshi
+// Copyright (C) 2008-2010 FURUHASHI Sadayuki
 //
-//    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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
 //
-#ifndef MSGPACK_V1_CPP03_ZONE_HPP
-#define MSGPACK_V1_CPP03_ZONE_HPP
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+#ifndef MSGPACK_CPP03_ZONE_HPP
+#define MSGPACK_CPP03_ZONE_HPP

-#include "msgpack/versioning.hpp"
-#include "msgpack/cpp_config.hpp"
-#include "msgpack/zone_decl.hpp"
-#include "msgpack/assert.hpp"
-
-#include <stdint.h>
 #include <cstdlib>
 #include <memory>
 #include <vector>

+#include "msgpack/versioning.hpp"
+
+#ifndef MSGPACK_ZONE_CHUNK_SIZE
+#define MSGPACK_ZONE_CHUNK_SIZE 8192
+#endif
+
+#ifndef MSGPACK_ZONE_ALIGN
+#define MSGPACK_ZONE_ALIGN sizeof(void*)
+#endif
+
 <% GENERATION_LIMIT = 15 %>
 namespace msgpack {

-/// @cond
 MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond

 class zone {
    struct finalizer {
@@ -35,7 +45,7 @@ class zone {
        void* m_data;
    };
    struct finalizer_array {
-        finalizer_array():m_tail(MSGPACK_NULLPTR), m_end(MSGPACK_NULLPTR), m_array(MSGPACK_NULLPTR) {}
+        finalizer_array():m_tail(nullptr), m_end(nullptr), m_array(nullptr) {}
        void call() {
            finalizer* fin = m_tail;
            for(; fin != m_array; --fin) (*(fin-1))();
@@ -63,7 +73,7 @@ class zone {
            ++m_tail;
        }
        void push_expand(void (*func)(void*), void* data) {
-            const size_t nused = static_cast<size_t>(m_end - m_array);
+            const size_t nused = m_end - m_array;
            size_t nnext;
            if(nused == 0) {
                nnext = (sizeof(finalizer) < 72/2) ?
@@ -101,7 +111,7 @@ class zone {
            m_head = c;
            m_free = chunk_size;
            m_ptr  = reinterpret_cast<char*>(c) + sizeof(chunk);
-            c->m_next = MSGPACK_NULLPTR;
+            c->m_next = nullptr;
        }
        ~chunk_list()
        {
@@ -121,11 +131,10 @@ class zone {
                    ::free(c);
                    c = n;
                } else {
-                    m_head = c;
                    break;
                }
            }
-            m_head->m_next = MSGPACK_NULLPTR;
+            m_head->m_next = nullptr;
            m_free = chunk_size;
            m_ptr  = reinterpret_cast<char*>(m_head) + sizeof(chunk);
        }
@@ -138,7 +147,7 @@ class zone {
    finalizer_array m_finalizer_array;

 public:
-    zone(size_t chunk_size = MSGPACK_ZONE_CHUNK_SIZE);
+    zone(size_t chunk_size = MSGPACK_ZONE_CHUNK_SIZE) /* throw() */;

 public:
    void* allocate_align(size_t size, size_t align = MSGPACK_ZONE_ALIGN);
@@ -170,12 +179,10 @@ public:
    {
        ::operator delete(p, place);
    }
-    /// @cond
    <%0.upto(GENERATION_LIMIT) {|i|%>
    template <typename T<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
    T* allocate(<%=(1..i).map{|j|"A#{j} a#{j}"}.join(', ')%>);
    <%}%>
-    /// @endcond

 private:
    void undo_allocate(size_t size);
@@ -186,55 +193,47 @@ private:
    template <typename T>
    static void object_delete(void* obj);

-    static char* get_aligned(char* ptr, size_t align);
-
-    char* allocate_expand(size_t size);
+    void* allocate_expand(size_t size);
 private:
    zone(const zone&);
    zone& operator=(const zone&);
 };

-inline zone::zone(size_t chunk_size):m_chunk_size(chunk_size), m_chunk_list(m_chunk_size)
+inline zone::zone(size_t chunk_size) /* throw() */ :m_chunk_size(chunk_size), m_chunk_list(m_chunk_size)
 {
 }

-inline char* zone::get_aligned(char* ptr, size_t align)
-{
-    MSGPACK_ASSERT(align != 0 && (align & (align - 1)) == 0); // align must be 2^n (n >= 0)
-    return
-        reinterpret_cast<char*>(
-            reinterpret_cast<uintptr_t>(ptr + (align - 1)) & ~static_cast<uintptr_t>(align - 1)
-        );
-}
-
 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);
+    char* aligned =
+        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;
    }
-    m_chunk_list.m_free -= adjusted_size;
-    m_chunk_list.m_ptr  += adjusted_size;
-    return aligned;
+    return reinterpret_cast<char*>(
+        reinterpret_cast<size_t>(
+            allocate_expand(size + (align - 1))) / align * align);
 }

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

    return ptr;
 }

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

@@ -256,8 +255,8 @@ inline char* zone::allocate_expand(size_t size)

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

    return ptr;
 }
@@ -305,18 +304,11 @@ inline void zone::undo_allocate(size_t size)
    m_chunk_list.m_free += size;
 }

-inline std::size_t aligned_size(
-    std::size_t size,
-    std::size_t align) {
-    return (size + align - 1) / align * align;
-}
-
-/// @cond
 <%0.upto(GENERATION_LIMIT) {|i|%>
 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), MSGPACK_ZONE_ALIGNOF(T));
+    void* x = allocate_align(sizeof(T));
    try {
        m_finalizer_array.push(&zone::object_destruct<T>, x);
    } catch (...) {
@@ -332,12 +324,9 @@ T* zone::allocate(<%=(1..i).map{|j|"A#{j} a#{j}"}.join(', ')%>)
    }
 }
 <%}%>
-/// @endcond

-/// @cond
 }  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond

 }  // namespace msgpack

-#endif // MSGPACK_V1_CPP03_ZONE_HPP
+#endif // MSGPACK_CPP03_ZONE_HPP
--- a/erb/v1/cpp03_define_array.hpp.erb
+++ b/erb/v1/cpp03_define_array.hpp.erb
@@ -1,110 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2008-2016 FURUHASHI Sadayuki and 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_V1_CPP03_DEFINE_ARRAY_HPP
-#define MSGPACK_V1_CPP03_DEFINE_ARRAY_HPP
-
-#include "msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp"
-#include "msgpack/adaptor/msgpack_tuple.hpp"
-#include "msgpack/adaptor/adaptor_base.hpp"
-#include "msgpack/object_fwd.hpp"
-
-namespace msgpack {
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-namespace type {
-
-<% GENERATION_LIMIT = 31 %>
-template <>
-struct define_array<> {
-    typedef define_array<> value_type;
-    typedef tuple<> tuple_type;
-    template <typename Packer>
-    void msgpack_pack(Packer& pk) const
-    {
-        pk.pack_array(0);
-    }
-    void msgpack_unpack(msgpack::object const& o)
-    {
-        if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
-    }
-    void msgpack_object(msgpack::object* o, msgpack::zone&) const
-    {
-        o->type = msgpack::type::ARRAY;
-        o->via.array.ptr = MSGPACK_NULLPTR;
-        o->via.array.size = 0;
-    }
-};
-
-/// @cond
-<%0.upto(GENERATION_LIMIT) {|i|%>
-template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-struct define_array<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
-    typedef define_array<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> value_type;
-    typedef tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> tuple_type;
-    define_array(A0& _a0<%1.upto(i) {|j|%>, A<%=j%>& _a<%=j%><%}%>) :
-        a0(_a0)<%1.upto(i) {|j|%>, a<%=j%>(_a<%=j%>)<%}%> {}
-    template <typename Packer>
-    void msgpack_pack(Packer& pk) const
-    {
-        pk.pack_array(<%=i+1%>);
-        <%0.upto(i) {|j|%>
-        pk.pack(a<%=j%>);<%}%>
-    }
-    void msgpack_unpack(msgpack::object const& o)
-    {
-        if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
-        const size_t size = o.via.array.size;
-        if(size > 0) {
-            msgpack::object *ptr = o.via.array.ptr;
-            switch(size) {
-            default:<%(i).downto(0) {|j|%>
-            case <%=j+1%>: ptr[<%=j%>].convert(a<%=j%>);
-            // fallthrough
-<%}%>
-            }
-        }
-    }
-    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%>, 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);<%}%>
-    }
-    <%0.upto(i) {|j|%>
-    A<%=j%>& a<%=j%>;<%}%>
-};
-<%}%>
-/// @endcond
-
-inline define_array<> make_define_array()
-{
-    return define_array<>();
-}
-
-/// @cond
-<%0.upto(GENERATION_LIMIT) {|i|%>
-template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-inline define_array<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_define_array(A0& a0<%1.upto(i) {|j|%>, A<%=j%>& a<%=j%><%}%>)
-{
-    return define_array<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>(a0<%1.upto(i) {|j|%>, a<%=j%><%}%>);
-}
-<%}%>
-/// @endcond
-
-}  // namespace type
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-}  // namespace msgpack
-
-#endif // MSGPACK_V1_CPP03_DEFINE_ARRAY_HPP
--- a/erb/v1/cpp03_define_array_decl.hpp.erb
+++ b/erb/v1/cpp03_define_array_decl.hpp.erb
@@ -1,42 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2008-2016 FURUHASHI Sadayuki and 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_V1_CPP03_DEFINE_ARRAY_DECL_HPP
-#define MSGPACK_V1_CPP03_DEFINE_ARRAY_DECL_HPP
-
-#include "msgpack/versioning.hpp"
-
-namespace msgpack {
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-namespace type {
-
-/// @cond
-<% GENERATION_LIMIT = 31 %>
-template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
-struct define_array;
-/// @endcond
-
-define_array<> make_define_array();
-
-/// @cond
-<%0.upto(GENERATION_LIMIT) {|i|%>
-template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-inline define_array<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_define_array(A0& a0<%1.upto(i) {|j|%>, A<%=j%>& a<%=j%><%}%>);
-<%}%>
-/// @endcond
-
-}  // namespace type
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-}  // namespace msgpack
-
-#endif // MSGPACK_V1_CPP03_DEFINE_ARRAY_DECL_HPP
--- a/erb/v1/cpp03_define_map.hpp.erb
+++ b/erb/v1/cpp03_define_map.hpp.erb
@@ -1,120 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2015-2016 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_V1_CPP03_DEFINE_MAP_HPP
-#define MSGPACK_V1_CPP03_DEFINE_MAP_HPP
-
-#include "msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp"
-#include "msgpack/adaptor/msgpack_tuple.hpp"
-#include "msgpack/adaptor/adaptor_base.hpp"
-#include "msgpack/object_fwd.hpp"
-
-#include <map>
-
-namespace msgpack {
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-namespace type {
-
-<% GENERATION_LIMIT = 31 %>
-template <>
-struct define_map<> {
-    template <typename Packer>
-    void msgpack_pack(Packer& pk) const
-    {
-        pk.pack_map(0);
-    }
-    void msgpack_unpack(msgpack::object const& o) const
-    {
-        if(o.type != msgpack::type::MAP) { throw msgpack::type_error(); }
-    }
-    void msgpack_object(msgpack::object* o, msgpack::zone&) const
-    {
-        o->type = msgpack::type::MAP;
-        o->via.map.ptr = MSGPACK_NULLPTR;
-        o->via.map.size = 0;
-    }
-};
-
-/// @cond
-<%1.step(GENERATION_LIMIT+1,2) {|i|%>
-template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-struct define_map<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
-    define_map(A0& _a0<%1.upto(i) {|j|%>, A<%=j%>& _a<%=j%><%}%>) :
-        a0(_a0)<%1.upto(i) {|j|%>, a<%=j%>(_a<%=j%>)<%}%> {}
-    template <typename Packer>
-    void msgpack_pack(Packer& pk) const
-    {
-        pk.pack_map(<%=(i+1)/2%>);
-        <%0.upto(i) {|j|%>
-        pk.pack(a<%=j%>);<%}%>
-    }
-    void msgpack_unpack(msgpack::object const& o) const
-    {
-        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(
-                        o.via.map.ptr[i].key.via.str.ptr,
-                        o.via.map.ptr[i].key.via.str.size),
-                    &o.via.map.ptr[i].val
-                )
-            );
-        }
-        <%0.step(i,2) {|j|%>
-        {
-            std::map<std::string, msgpack::object const*>::const_iterator it = kvmap.find(a<%=j%>);
-            if (it != kvmap.end()) {
-                it->second->convert(a<%=j+1%>);
-            }
-        }
-        <%}%>
-    }
-    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%>, 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);
-        o->via.map.ptr[<%=j/2%>].val = msgpack::object(a<%=j+1%>, z);
-        <%}%>
-    }
-    <%0.upto(i) {|j|%>
-    A<%=j%>& a<%=j%>;<%}%>
-};
-<%}%>
-/// @endcond
-
-inline define_map<> make_define_map()
-{
-    return define_map<>();
-}
-
-/// @cond
-<%0.upto(GENERATION_LIMIT) {|i|%>
-template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-inline define_map<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_define_map(A0& a0<%1.upto(i) {|j|%>, A<%=j%>& a<%=j%><%}%>)
-{
-    return define_map<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>(a0<%1.upto(i) {|j|%>, a<%=j%><%}%>);
-}
-<%}%>
-/// @endcond
-
-}  // namespace type
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-}  // namespace msgpack
-
-#endif // MSGPACK_V1_CPP03_DEFINE_MAP_HPP
--- a/erb/v1/cpp03_define_map_decl.hpp.erb
+++ b/erb/v1/cpp03_define_map_decl.hpp.erb
@@ -1,42 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2015-2016 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_V1_CPP03_DEFINE_MAP_DECL_HPP
-#define MSGPACK_V1_CPP03_DEFINE_MAP_DECL_HPP
-
-#include "msgpack/versioning.hpp"
-
-namespace msgpack {
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-namespace type {
-
-/// @cond
-<% GENERATION_LIMIT = 31 %>
-template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
-struct define_map;
-/// @endcond
-
-define_map<> make_define_map();
-
-/// @cond
-<%0.upto(GENERATION_LIMIT) {|i|%>
-template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-define_map<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_define_map(A0& a0<%1.upto(i) {|j|%>, A<%=j%>& a<%=j%><%}%>);
-<%}%>
-/// @endcond
-
-}  // namespace type
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-}  // namespace msgpack
-
-#endif // MSGPACK_V1_CPP03_DEFINE_MAP_DECL_HPP
--- a/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb
+++ b/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb
@@ -1,69 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2008-2016 FURUHASHI Sadayuki and 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_V1_CPP03_MSGPACK_TUPLE_DECL_HPP
-#define MSGPACK_V1_CPP03_MSGPACK_TUPLE_DECL_HPP
-
-#include "msgpack/versioning.hpp"
-#include "msgpack/object.hpp"
-#include "msgpack/adaptor/adaptor_base.hpp"
-
-namespace msgpack {
-
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-namespace type {
-
-// FIXME operator==
-// FIXME operator!=
-<% GENERATION_LIMIT = 31 %>
-
-/// @cond
-template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
-struct tuple;
-/// @endcond
-
-template <typename Tuple, int N>
-struct tuple_element;
-
-template <typename Tuple, int N>
-struct const_tuple_element;
-
-template <typename T>
-struct tuple_type;
-
-/// @cond
-<%0.upto(GENERATION_LIMIT) {|i|%>
-template <int N, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-typename type::tuple_element<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>, N>::reference get(type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& t);
-template <int N, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-typename type::const_tuple_element<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>, N>::const_reference get(type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> const& t);
-<%}%>
-/// @endcond
-
-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(A0 const& a0<%1.upto(i) {|j|%>, A<%=j%> const& a<%=j%><%}%>);
-<%}%>
-/// @endcond
-
-}  // namespace type
-
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-}  // namespace msgpack
-
-#endif // MSGPACK_V1_CPP03_MSGPACK_TUPLE_DECL_HPP
--- a/erb/v1/cpp03_zone_decl.hpp.erb
+++ b/erb/v1/cpp03_zone_decl.hpp.erb
@@ -1,54 +0,0 @@
-//
-// MessagePack for C++ memory pool
-//
-// Copyright (C) 2008-2016 FURUHASHI Sadayuki and 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_V1_CPP03_ZONE_DECL_HPP
-#define MSGPACK_V1_CPP03_ZONE_DECL_HPP
-
-#include <cstdlib>
-#include <memory>
-#include <vector>
-
-#include "msgpack/versioning.hpp"
-
-#ifndef MSGPACK_ZONE_CHUNK_SIZE
-#define MSGPACK_ZONE_CHUNK_SIZE 8192
-#endif
-
-#ifndef MSGPACK_ZONE_ALIGN
-#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 {
-
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-class zone;
-
-std::size_t aligned_size(
-    std::size_t size,
-    std::size_t align = MSGPACK_ZONE_ALIGN);
-
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-}  // namespace msgpack
-
-#endif // MSGPACK_V1_CPP03_ZONE_DECL_HPP
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -1,9 +0,0 @@
-ADD_SUBDIRECTORY (cpp03)
-ADD_SUBDIRECTORY (cpp11)
-
-IF (MSGPACK_USE_BOOST)
-    ADD_SUBDIRECTORY (boost)
-    IF (MSGPACK_USE_X3_PARSE)
-        ADD_SUBDIRECTORY (x3)
-    ENDIF ()
-ENDIF ()
--- a/example/boost/CMakeLists.txt
+++ b/example/boost/CMakeLists.txt
@@ -1,46 +0,0 @@
-FIND_PACKAGE (Boost REQUIRED COMPONENTS system)
-FIND_PACKAGE (Threads REQUIRED)
-FIND_PACKAGE (ZLIB REQUIRED)
-
-LIST (APPEND exec_PROGRAMS
-    msgpack_variant_capitalize.cpp
-    msgpack_variant_mapbased.cpp
-)
-
-IF (MSGPACK_CXX11 OR MSGPACK_CXX14 OR MSGPACK_CXX17 OR MSGPACK_CXX20)
-    LIST (APPEND exec_PROGRAMS asio_send_recv.cpp)
-    IF (ZLIB_FOUND)
-        LIST (APPEND exec_PROGRAMS asio_send_recv_zlib.cpp)
-    ENDIF ()
-ENDIF ()
-
-FOREACH (source_file ${exec_PROGRAMS})
-    GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
-    ADD_EXECUTABLE (
-        ${source_file_we}
-        ${source_file}
-    )
-    TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
-        msgpackc-cxx
-        Boost::system
-        Threads::Threads
-    )
-    IF (ZLIB_FOUND)
-        TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE ZLIB::ZLIB)
-    ENDIF ()
-    IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
-    ENDIF ()
-
-    IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
-    ENDIF ()
-
-    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-            STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-        ELSE ()
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX")
-        ENDIF ()
-    ENDIF ()
-ENDFOREACH ()
--- a/example/boost/asio_send_recv.cpp
+++ b/example/boost/asio_send_recv.cpp
@@ -1,104 +0,0 @@
-// 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
@@ -1,176 +0,0 @@
-// 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 = static_cast<uInt>(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 = static_cast<uInt>(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/boost/msgpack_variant_capitalize.cpp
+++ b/example/boost/msgpack_variant_capitalize.cpp
@@ -1,94 +0,0 @@
-// MessagePack for C++ example
-//
-// Copyright (C) 2015 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 <algorithm>
-#include <cctype>
-
-#include <msgpack.hpp>
-
-struct user {
-    std::string name;
-    int age;
-    std::string address;
-    MSGPACK_DEFINE(name, age, address);
-};
-
-struct proc:boost::static_visitor<void> {
-    void operator()(std::string& v) const {
-        std::cout << "  match std::string& v" << std::endl;
-        std::cout << "    v: " << v << std::endl;
-        std::cout << "    capitalize" << std::endl;
-        for (std::string::iterator it = v.begin(), end = v.end();
-             it != end;
-             ++it) {
-            *it = std::toupper(*it);
-        }
-    }
-    void operator()(std::vector<msgpack::type::variant>& v) const {
-        std::cout << "match vector (msgpack::type::ARRAY)" << std::endl;
-        std::vector<msgpack::type::variant>::iterator it = v.begin();
-        std::vector<msgpack::type::variant>::const_iterator end = v.end();
-        for (; it != end; ++it) {
-            boost::apply_visitor(*this, *it);
-        }
-    }
-    template <typename T>
-    void operator()(T const&) const {
-        std::cout << "  match others" << std::endl;
-    }
-};
-
-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() {
-    std::stringstream ss1;
-    user u;
-    u.name = "Takatoshi Kondo";
-    u.age = 42;
-    u.address = "Tokyo, JAPAN";
-
-    std::cout << "Packing object." << std::endl;
-    msgpack::pack(ss1, u);
-    print(ss1.str());
-
-    msgpack::object_handle oh1 = msgpack::unpack(ss1.str().data(), ss1.str().size());
-    msgpack::object const& obj1 = oh1.get();
-    std::cout << "Unpacked msgpack object." << std::endl;
-    std::cout << obj1 << std::endl;
-
-    msgpack::type::variant v = obj1.as<msgpack::type::variant>();
-    std::cout << "Applying proc..." << std::endl;
-    boost::apply_visitor(proc(), v);
-
-    std::stringstream ss2;
-    std::cout << "Packing modified object." << std::endl;
-    msgpack::pack(ss2, v);
-    print(ss2.str());
-
-    msgpack::object_handle oh2 = msgpack::unpack(ss2.str().data(), ss2.str().size());
-    msgpack::object const& obj2 = oh2.get();
-    std::cout << "Modified msgpack object." << std::endl;
-    std::cout << obj2 << std::endl;
-}
--- a/example/boost/msgpack_variant_mapbased.cpp
+++ b/example/boost/msgpack_variant_mapbased.cpp
@@ -1,97 +0,0 @@
-// MessagePack for C++ example
-//
-// Copyright (C) 2015 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 <msgpack.hpp>
-
-struct user {
-    std::string name;
-    int age;
-    std::string address;
-    MSGPACK_DEFINE_MAP(name, age, address);
-};
-
-struct proc:boost::static_visitor<void> {
-    // msgpack::type::MAP is converted to std::multimap, not std::map.
-    void operator()(std::multimap<msgpack::type::variant_ref, msgpack::type::variant_ref>& v) const {
-        std::cout << "match map" << std::endl;
-        std::multimap<msgpack::type::variant_ref, msgpack::type::variant_ref>::iterator it = v.begin();
-        std::multimap<msgpack::type::variant_ref, msgpack::type::variant_ref>::iterator end = v.end();
-        while(it != end) {
-            boost::string_ref const& key = it->first.as_boost_string_ref();
-            if (key == "name") {
-                boost::string_ref const& value = it->second.as_boost_string_ref();
-                if (value == "Takatoshi Kondo") {
-                    // You can add values to msgpack::type::variant_ref.
-                    v.insert(
-                        std::multimap<msgpack::type::variant_ref, msgpack::type::variant_ref>::value_type(
-                            "role",
-                            "msgpack-c committer"
-                        )
-                    );
-                }
-                ++it;
-            }
-            else if (key == "age") {
-                // You can remove key-value pair from msgpack::type::variant_ref
-
-#if defined(MSGPACK_USE_CPP03)
-#  if MSGPACK_LIB_STD_CXX
-                v.erase(std::multimap<msgpack::type::variant_ref, msgpack::type::variant_ref>::const_iterator(it++));
-#  else  // MSGPACK_LIB_STD_CXX
-                v.erase(it++);
-#  endif // MSGPACK_LIB_STD_CXX
-#else  // defined(MSGPACK_USE_CPP03)
-#  if MSGPACK_LIB_STD_CXX
-                it = v.erase(std::multimap<msgpack::type::variant_ref, msgpack::type::variant_ref>::const_iterator(it));
-#  else  // MSGPACK_LIB_STD_CXX
-                it = v.erase(it);
-#  endif // MSGPACK_LIB_STD_CXX
-#endif // defined(MSGPACK_USE_CPP03)
-            }
-            else if (key == "address") {
-                // When you want to append string
-                // "Tokyo" -> "Tokyo, JAPAN"
-                // Use msgpack::type::variant instead of msgpack::type::variant_ref
-                // or do as follows:
-                boost::string_ref const& value = it->second.as_boost_string_ref();
-                it->second = std::string(&value.front(), value.size()) + ", JAPAN";
-                ++it;
-            }
-        }
-    }
-    template <typename T>
-    void operator()(T const&) const {
-        std::cout << "  match others" << std::endl;
-    }
-};
-
-int main() {
-    std::stringstream ss;
-    user u;
-    u.name = "Takatoshi Kondo";
-    u.age = 42;
-    u.address = "Tokyo";
-    msgpack::pack(ss, u);
-
-    std::string const& str = ss.str();
-    msgpack::object_handle oh = msgpack::unpack(str.data(), str.size());
-    msgpack::object const& obj = oh.get();
-    std::cout << "Unpacked msgpack object." << std::endl;
-    std::cout << obj << std::endl;
-    msgpack::type::variant_ref v = obj.as<msgpack::type::variant_ref>();
-    std::cout << "Applying proc..." << std::endl;
-    boost::apply_visitor(proc(), v);
-    msgpack::zone z;
-    std::cout << "Applied msgpack object." << std::endl;
-    std::cout << msgpack::object(v, z) << std::endl;
-}
--- a/example/c/lib_buffer_unpack.c
+++ b/example/c/lib_buffer_unpack.c
@@ -0,0 +1,119 @@
+#include <msgpack.h>
+#include <stdio.h>
+#include <assert.h>
+
+
+typedef struct receiver {
+    msgpack_sbuffer sbuf;
+    size_t rest;
+} receiver;
+
+receiver r;
+
+void receiver_init(receiver *r) {
+    msgpack_packer pk;
+
+    msgpack_sbuffer_init(&r->sbuf);
+    msgpack_packer_init(&pk, &r->sbuf, msgpack_sbuffer_write);
+    /* 1st object */
+    msgpack_pack_array(&pk, 3);
+    msgpack_pack_int(&pk, 1);
+    msgpack_pack_true(&pk);
+    msgpack_pack_str(&pk, 7);
+    msgpack_pack_str_body(&pk, "example", 7);
+    /* 2nd object */
+    msgpack_pack_str(&pk, 6);
+    msgpack_pack_str_body(&pk, "second", 6);
+    /* 3rd object */
+    msgpack_pack_array(&pk, 2);
+    msgpack_pack_int(&pk, 42);
+    msgpack_pack_false(&pk);
+    r->rest = r->sbuf.size;
+}
+
+size_t receiver_recv(receiver *r, char* buf, size_t try_size) {
+    size_t off = r->sbuf.size - r->rest;
+
+    size_t actual_size = try_size;
+    if (actual_size > r->rest) actual_size = r->rest;
+
+    memcpy(buf, r->sbuf.data + off, actual_size);
+    r->rest -= actual_size;
+
+    return actual_size;
+}
+
+#define EACH_RECV_SIZE 4
+
+void unpack(receiver* r) {
+    /* buf is allocated by unpacker. */
+    msgpack_unpacker* unp = msgpack_unpacker_new(100);
+    msgpack_unpacked result;
+    msgpack_unpack_return ret;
+    char* buf;
+    size_t recv_len;
+    int recv_count = 0;
+
+    msgpack_unpacked_init(&result);
+    if (msgpack_unpacker_buffer_capacity(unp) < EACH_RECV_SIZE) {
+        bool expanded = msgpack_unpacker_reserve_buffer(unp, 100);
+        assert(expanded);
+    }
+    buf = msgpack_unpacker_buffer(unp);
+
+    recv_len = receiver_recv(r, buf, EACH_RECV_SIZE);
+    msgpack_unpacker_buffer_consumed(unp, recv_len);
+
+
+    while (recv_len > 0) {
+        int i = 0;
+        printf("receive count: %d %zd bytes received.:\n", recv_count++, recv_len);
+        ret = msgpack_unpacker_next(unp, &result);
+        while (ret == MSGPACK_UNPACK_SUCCESS) {
+            msgpack_object obj = result.data;
+
+            /* Use obj. */
+            printf("Object no %d:\n", i++);
+            msgpack_object_print(stdout, obj);
+            printf("\n");
+            /* If you want to allocate something on the zone, you can use zone. */
+            /* msgpack_zone* zone = result.zone; */
+            /* The lifetime of the obj and the zone,  */
+
+            ret = msgpack_unpacker_next(unp, &result);
+        }
+        if (ret == MSGPACK_UNPACK_PARSE_ERROR) {
+            printf("The data in the buf is invalid format.\n");
+            msgpack_unpacked_destroy(&result);
+            return;
+        }
+        if (msgpack_unpacker_buffer_capacity(unp) < EACH_RECV_SIZE) {
+            bool expanded = msgpack_unpacker_reserve_buffer(unp, 100);
+            assert(expanded);
+        }
+        buf = msgpack_unpacker_buffer(unp);
+        recv_len = receiver_recv(r, buf, 4);
+        msgpack_unpacker_buffer_consumed(unp, recv_len);
+    }
+    msgpack_unpacked_destroy(&result);
+}
+
+int main(void) {
+    receiver r;
+    receiver_init(&r);
+
+    unpack(&r);
+
+    return 0;
+}
+
+/* Output */
+
+/*
+Object no 1:
+[1, true, "example"]
+Object no 2:
+"second"
+Object no 3:
+[42, false]
+*/
--- a/example/c/simple.c
+++ b/example/c/simple.c
@@ -0,0 +1,38 @@
+#include <msgpack.h>
+#include <stdio.h>
+
+int main(void)
+{
+    msgpack_sbuffer sbuf;
+    msgpack_packer pk;
+    msgpack_zone mempool;
+    msgpack_object deserialized;
+
+    /* msgpack::sbuffer is a simple buffer implementation. */
+    msgpack_sbuffer_init(&sbuf);
+
+    /* serialize values into the buffer using msgpack_sbuffer_write callback function. */
+    msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write);
+
+    msgpack_pack_array(&pk, 3);
+    msgpack_pack_int(&pk, 1);
+    msgpack_pack_true(&pk);
+    msgpack_pack_str(&pk, 7);
+    msgpack_pack_str_body(&pk, "example", 7);
+
+    /* deserialize the buffer into msgpack_object instance. */
+    /* deserialized object is valid during the msgpack_zone instance alive. */
+    msgpack_zone_init(&mempool, 2048);
+
+    msgpack_unpack(sbuf.data, sbuf.size, NULL, &mempool, &deserialized);
+
+    /* print the deserialized object. */
+    msgpack_object_print(stdout, deserialized);
+    puts("");
+
+    msgpack_zone_destroy(&mempool);
+    msgpack_sbuffer_destroy(&sbuf);
+
+    return 0;
+}
+
--- a/example/c/speed_test_uint32_array.c
+++ b/example/c/speed_test_uint32_array.c
@@ -0,0 +1,36 @@
+#include <msgpack.h>
+
+void test()
+{
+    size_t size = 10000000;
+    msgpack_sbuffer buf;
+    msgpack_packer * pk;
+    size_t upk_pos = 0;
+    msgpack_unpacked msg;
+    
+    msgpack_sbuffer_init(&buf);
+
+    pk = msgpack_packer_new(&buf, msgpack_sbuffer_write);
+
+    msgpack_pack_array(pk, size);
+    {
+        int idx = 0;
+        for (; idx < size; ++idx)
+            msgpack_pack_uint32(pk, 1);
+    }
+    msgpack_packer_free(pk);
+
+    msgpack_unpacked_init(&msg);
+
+    while (msgpack_unpack_next(&msg, buf.data, buf.size, &upk_pos)) {
+    }
+
+    msgpack_sbuffer_destroy(&buf);
+}
+
+int main(int argc, char **argv)
+{
+    int i = 0;
+    for (; i < 10; ++i) test();
+    return 0;
+}
--- a/example/c/speed_test_uint64_array.c
+++ b/example/c/speed_test_uint64_array.c
@@ -0,0 +1,37 @@
+#include <msgpack.h>
+
+void test()
+{
+    uint64_t test_u64 = 0xFFF0000000000001LL;
+    size_t size = 10000000;
+    msgpack_sbuffer buf;
+    msgpack_packer * pk;
+    size_t upk_pos = 0;
+    msgpack_unpacked msg;
+
+    msgpack_sbuffer_init(&buf);
+
+    pk = msgpack_packer_new(&buf, msgpack_sbuffer_write);
+
+    msgpack_pack_array(pk, size);
+    {
+        int idx = 0;
+        for (; idx < size; ++idx)
+            msgpack_pack_uint64(pk, test_u64);
+    }
+    msgpack_packer_free(pk);
+
+    msgpack_unpacked_init(&msg);
+
+    while (msgpack_unpack_next(&msg, buf.data, buf.size, &upk_pos)) {
+    }
+
+    msgpack_sbuffer_destroy(&buf);
+}
+
+int main(int argc, char **argv)
+{
+    int i = 0;
+    for (; i < 10; ++i) test();
+    return 0;
+}
--- a/example/c/user_buffer_unpack.c
+++ b/example/c/user_buffer_unpack.c
@@ -0,0 +1,75 @@
+#include <msgpack.h>
+#include <stdio.h>
+#include <assert.h>
+
+void prepare(msgpack_sbuffer* sbuf) {
+    msgpack_packer pk;
+
+    msgpack_packer_init(&pk, sbuf, msgpack_sbuffer_write);
+    /* 1st object */
+    msgpack_pack_array(&pk, 3);
+    msgpack_pack_int(&pk, 1);
+    msgpack_pack_true(&pk);
+    msgpack_pack_str(&pk, 7);
+    msgpack_pack_str_body(&pk, "example", 7);
+    /* 2nd object */
+    msgpack_pack_str(&pk, 6);
+    msgpack_pack_str_body(&pk, "second", 6);
+    /* 3rd object */
+    msgpack_pack_array(&pk, 2);
+    msgpack_pack_int(&pk, 42);
+    msgpack_pack_false(&pk);
+}
+
+void unpack(char const* buf, size_t len) {
+    /* buf is allocated by client. */
+    msgpack_unpacked result;
+    size_t off = 0;
+    msgpack_unpack_return ret;
+    int i = 0;
+    msgpack_unpacked_init(&result);
+    ret = msgpack_unpack_next(&result, buf, len, &off);
+    while (ret == MSGPACK_UNPACK_SUCCESS) {
+        msgpack_object obj = result.data;
+
+        /* Use obj. */
+        printf("Object no %d:\n", i++);
+        msgpack_object_print(stdout, obj);
+        printf("\n");
+        /* If you want to allocate something on the zone, you can use zone. */
+        /* msgpack_zone* zone = result.zone; */
+        /* The lifetime of the obj and the zone,  */
+
+        ret = msgpack_unpack_next(&result, buf, len, &off);
+    }
+    msgpack_unpacked_destroy(&result);
+
+    if (ret == MSGPACK_UNPACK_CONTINUE) {
+        printf("All msgpack_object in the buffer is consumed.\n");
+    }
+    else if (ret == MSGPACK_UNPACK_PARSE_ERROR) {
+        printf("The data in the buf is invalid format.\n");
+    }
+}
+
+int main(void) {
+    msgpack_sbuffer sbuf;
+    msgpack_sbuffer_init(&sbuf);
+
+    prepare(&sbuf);
+    unpack(sbuf.data, sbuf.size);
+
+    msgpack_sbuffer_destroy(&sbuf);
+    return 0;
+}
+
+/* Output */
+
+/*
+Object no 1:
+[1, true, "example"]
+Object no 2:
+"second"
+Object no 3:
+[42, false]
+*/
--- a/example/cpp03/CMakeLists.txt
+++ b/example/cpp03/CMakeLists.txt
@@ -1,113 +0,0 @@
-FIND_PACKAGE (Threads REQUIRED)
-
-FIND_PACKAGE (Boost COMPONENTS timer)
-
-LIST (APPEND exec_PROGRAMS
-    class_intrusive.cpp
-    class_intrusive_map.cpp
-    class_non_intrusive.cpp
-    custom.cpp
-    enum.cpp
-    map_based_versionup.cpp
-    protocol_new.cpp
-    reuse_zone.cpp
-    simple.cpp
-)
-
-IF (MSGPACK_DEFAULT_API_VERSION EQUAL 1)
-    LIST (APPEND exec_PROGRAMS
-        protocol.cpp
-    )
-ENDIF ()
-
-IF (NOT MSVC)
-    LIST (APPEND with_pthread_PROGRAMS
-        stream.cpp
-    )
-ENDIF ()
-
-
-IF (MSGPACK_USE_BOOST)
-    IF (Boost_TIMER_LIBRARY)
-        LIST (APPEND with_boost_lib_PROGRAMS
-            speed_test.cpp
-            speed_test_nested_array.cpp
-        )
-    ENDIF ()
-ENDIF ()
-
-FOREACH (source_file ${exec_PROGRAMS})
-    GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
-    ADD_EXECUTABLE (
-        ${source_file_we}
-        ${source_file}
-    )
-    TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
-        msgpackc-cxx
-    )
-    IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        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]")
-            STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-        ELSE ()
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX")
-        ENDIF ()
-    ENDIF ()
-ENDFOREACH ()
-
-FOREACH (source_file ${with_pthread_PROGRAMS})
-    GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
-    ADD_EXECUTABLE (
-        ${source_file_we}
-        ${source_file}
-    )
-    TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
-        msgpackc-cxx
-        Threads::Threads
-    )
-    IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        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]")
-            STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-        ELSE ()
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX")
-        ENDIF ()
-    ENDIF ()
-ENDFOREACH ()
-
-FOREACH (source_file ${with_boost_lib_PROGRAMS})
-    GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
-    ADD_EXECUTABLE (
-        ${source_file_we}
-        ${source_file}
-    )
-    TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
-        msgpackc-cxx
-        Boost::timer
-    )
-    IF (NOT MSVC AND NOT APPLE)
-        TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
-            rt
-        )
-    ENDIF ()
-
-    IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -O3")
-    ENDIF ()
-
-    IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
-    ENDIF ()
-
-    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-            STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-        ELSE ()
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX")
-        ENDIF ()
-    ENDIF ()
-ENDFOREACH ()
--- a/example/cpp03/class_intrusive.cpp
+++ b/example/cpp03/class_intrusive.cpp
@@ -2,9 +2,17 @@
 //
 // Copyright (C) 2008-2015 FURUHASHI Sadayuki and 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

 #include <string>
@@ -13,42 +21,18 @@
 #include <sstream>
 #include <cassert>

-// When you want to adapt map instead of array, you can enable these macro definition.
-//
-// #define MSGPACK_USE_DEFINE_MAP
+// msgpack.hpp is also ok
+#include <msgpack_fwd.hpp>


-#include <msgpack.hpp>
-
-struct my_base1 {
-    int a;
-    MSGPACK_DEFINE(a);
-};
-inline bool operator==(my_base1 const& lhs, my_base1 const& rhs) {
-    return lhs.a == rhs.a;
-}
-
-struct my_base2 {
-    std::string b;
-    std::string c;
-    MSGPACK_DEFINE(b, c);
-};
-inline bool operator==(my_base2 const& lhs, my_base2 const& rhs) {
-    return lhs.b == rhs.b && lhs.c == rhs.c;
-}
-
-class my_class : public my_base1, private my_base2 {
+class my_class {
 public:
    my_class() {} // When you want to convert from msgpack::object to my_class,
                  // my_class should be default constractible.
    my_class(std::string const& name, int age):name_(name), age_(age) {}
-    void set_b(std::string const& str) { b = str; }
-    void set_c(std::string const& str) { c = str; }
+
    friend bool operator==(my_class const& lhs, my_class const& rhs) {
-        return
-            static_cast<my_base1 const&>(lhs) == static_cast<my_base1 const&>(rhs) &&
-            static_cast<my_base2 const&>(lhs) == static_cast<my_base2 const&>(rhs) &&
-            lhs.name_ == rhs.name_ && lhs.age_ == rhs.age_;
+        return lhs.name_ == rhs.name_ && lhs.age_ == rhs.age_;
    }

 private:
@@ -56,7 +40,7 @@ private:
    int age_;

 public:
-    MSGPACK_DEFINE(name_, age_, MSGPACK_BASE(my_base1), MSGPACK_BASE(my_base2));
+    MSGPACK_DEFINE(name_, age_);
 };

 void print(std::string const& buf) {
@@ -73,29 +57,24 @@ void print(std::string const& buf) {
    std::cout << std::dec << std::endl;
 }

+#include <msgpack.hpp>
+
 int main() {
    {   // pack, unpack
        my_class my("John Smith", 42);
-        my.a = 123;
-        my.set_b("ABC");
-        my.set_c("DEF");
        std::stringstream ss;
        msgpack::pack(ss, my);

-        std::string const& str = ss.str();
-        print(str);
+        print(ss.str());

-        msgpack::object_handle oh =
-            msgpack::unpack(str.data(), str.size());
-        msgpack::object obj = oh.get();
+        msgpack::unpacked unp;
+        msgpack::unpack(unp, ss.str().data(), ss.str().size());
+        msgpack::object obj = unp.get();
        std::cout << obj << std::endl;
        assert(obj.as<my_class>() == my);
    }
    {   // create object with zone
        my_class my("John Smith", 42);
-        my.a = 123;
-        my.set_b("ABC");
-        my.set_c("DEF");
        msgpack::zone z;
        msgpack::object obj(my, z);
        std::cout << obj << std::endl;
--- a/example/cpp03/class_intrusive_map.cpp
+++ b/example/cpp03/class_intrusive_map.cpp
@@ -1,76 +0,0 @@
-// MessagePack for C++ example
-//
-// Copyright (C) 2015 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 <iostream>
-#include <iomanip>
-#include <sstream>
-#include <cassert>
-
-#include <msgpack.hpp>
-
-
-class my_class {
-public:
-    my_class() {} // When you want to convert from msgpack::object to my_class,
-                  // my_class should be default constractible.
-                  // If you use C++11, you can adapt non-default constructible
-                  // classes to msgpack::object.
-                  // See https://github.com/msgpack/msgpack-c/wiki/v1_1_cpp_adaptor#non-default-constructible-class-support-c11-only
-    my_class(std::string const& name, int age):name_(name), age_(age) {}
-
-    friend bool operator==(my_class const& lhs, my_class const& rhs) {
-        return lhs.name_ == rhs.name_ && lhs.age_ == rhs.age_;
-    }
-
-private:
-    std::string name_;
-    int age_;
-
-public:
-    MSGPACK_DEFINE_MAP(name_, age_);
-};
-
-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() {
-    {   // pack, unpack
-        my_class my("John Smith", 42);
-        std::stringstream ss;
-        msgpack::pack(ss, my);
-
-        print(ss.str());
-
-        std::string const& str = ss.str();
-        msgpack::object_handle oh =
-            msgpack::unpack(str.data(), str.size());
-        msgpack::object obj = oh.get();
-        std::cout << obj << std::endl;
-        assert(obj.as<my_class>() == my);
-    }
-    {   // create object with zone
-        my_class my("John Smith", 42);
-        msgpack::zone z;
-        msgpack::object obj(my, z);
-        std::cout << obj << std::endl;
-        assert(obj.as<my_class>() == my);
-    }
-}
--- a/example/cpp03/class_non_intrusive.cpp
+++ b/example/cpp03/class_non_intrusive.cpp
@@ -2,9 +2,17 @@
 //
 // Copyright (C) 2008-2015 FURUHASHI Sadayuki and 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

 #include <string>
@@ -13,6 +21,27 @@
 #include <sstream>
 #include <cassert>

+// msgpack.hpp should be included at after user declarations
+#include <msgpack_fwd.hpp>
+
+
+// declarations
+class my_class;
+
+namespace msgpack {
+
+MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS) {
+
+object const& operator>> (msgpack::object const& o, my_class& v);
+
+template <typename Stream>
+packer<Stream>& operator<< (msgpack::packer<Stream>& o, my_class const& v);
+
+void operator<< (msgpack::object::with_zone& o, my_class const& v);
+
+} // MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS)
+} // namespace msgpack
+
 #include <msgpack.hpp>

 class my_class {
@@ -34,48 +63,40 @@ private:
    int age_;
 };

-// User defined class template specialization
+
+// definitions
+
 namespace msgpack {
+
 MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS) {
-namespace adaptor {

-template<>
-struct convert<my_class> {
-    msgpack::object const& operator()(msgpack::object const& o, my_class& v) const {
-        if (o.type != msgpack::type::ARRAY) throw msgpack::type_error();
-        if (o.via.array.size != 2) throw msgpack::type_error();
-        v = my_class(
-            o.via.array.ptr[0].as<std::string>(),
-            o.via.array.ptr[1].as<int>());
-        return o;
-    }
-};
+inline object const& operator>> (msgpack::object const& o, my_class& v) {
+    if (o.type != msgpack::type::ARRAY) throw msgpack::type_error();
+    if (o.via.array.size != 2) throw msgpack::type_error();
+    v = my_class(
+        o.via.array.ptr[0].as<std::string>(),
+        o.via.array.ptr[1].as<int>());
+    return o;
+}

-template<>
-struct pack<my_class> {
-    template <typename Stream>
-    packer<Stream>& operator()(msgpack::packer<Stream>& o, my_class const& v) const {
-        // packing member variables as an array.
-        o.pack_array(2);
-        o.pack(v.get_name());
-        o.pack(v.get_age());
-        return o;
-    }
-};

-template <>
-struct object_with_zone<my_class> {
-    void operator()(msgpack::object::with_zone& o, my_class const& v) const {
-        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, 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);
-    }
-};
+template <typename Stream>
+inline packer<Stream>& operator<< (msgpack::packer<Stream>& o, my_class const& v) {
+    // packing member variables as an array.
+    o.pack_array(2);
+    o.pack(v.get_name());
+    o.pack(v.get_age());
+    return o;
+}
+
+inline void operator<< (msgpack::object::with_zone& o, my_class const& v) {
+    o.type = type::ARRAY;
+    o.via.array.size = 2;
+    o.via.array.ptr = static_cast<object*>(o.zone.allocate_align(sizeof(object) * o.via.array.size));
+    o.via.array.ptr[0] = msgpack::object(v.get_name(), o.zone);
+    o.via.array.ptr[1] = msgpack::object(v.get_age(), o.zone);
+}

-} // namespace adaptor
 } // MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS)
 } // namespace msgpack

@@ -100,12 +121,11 @@ int main() {
        std::stringstream ss;
        msgpack::pack(ss, my);

-        std::string const& str = ss.str();
-        print(str);
+        print(ss.str());

-        msgpack::object_handle oh =
-            msgpack::unpack(str.data(), str.size());
-        msgpack::object obj = oh.get();
+        msgpack::unpacked unp;
+        msgpack::unpack(unp, ss.str().data(), ss.str().size());
+        msgpack::object obj = unp.get();
        std::cout << obj << std::endl;
        assert(obj.as<my_class>() == my);
    }
--- a/example/cpp03/custom.cpp
+++ b/example/cpp03/custom.cpp
@@ -2,9 +2,17 @@
 //
 // Copyright (C) 2008-2015 FURUHASHI Sadayuki and 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

 #include <msgpack.hpp>
@@ -40,11 +48,11 @@ int main(void)
        std::stringstream sbuf;
        msgpack::pack(sbuf, oc);

-        msgpack::object_handle oh =
-            msgpack::unpack(sbuf.str().data(), sbuf.str().size());
-        msgpack::object obj = oh.get();
+        msgpack::unpacked result;
+        msgpack::unpack(result, sbuf.str().data(), sbuf.str().size());
+        msgpack::object obj = result.get();

-        obj.convert(nc);
+        obj.convert(&nc);

        std::cout << obj << " value=" << nc.value << " flag=" << nc.flag << std::endl;
    }
@@ -56,11 +64,11 @@ int main(void)
        std::stringstream sbuf;
        msgpack::pack(sbuf, nc);

-        msgpack::object_handle oh =
-            msgpack::unpack(sbuf.str().data(), sbuf.str().size());
-        msgpack::object obj = oh.get();
+        msgpack::unpacked result;
+        msgpack::unpack(result, sbuf.str().data(), sbuf.str().size());
+        msgpack::object obj = result.get();

-        obj.convert(oc);
+        obj.convert(&oc);

        std::cout << obj << " value=" << oc.value << std::endl;
    }
--- a/example/cpp03/enum.cpp
+++ b/example/cpp03/enum.cpp
@@ -2,17 +2,24 @@
 //
 // Copyright (C) 2015 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

+#include <msgpack_fwd.hpp>
 #include <sstream>
 #include <iostream>
 #include <cassert>

-#include <msgpack.hpp>
-
 enum my_enum {
    elem1,
    elem2,
@@ -21,6 +28,8 @@ enum my_enum {

 MSGPACK_ADD_ENUM(my_enum);

+#include <msgpack.hpp>
+
 int main(void)
 {
    {   // pack, unpack
@@ -30,20 +39,20 @@ int main(void)
        my_enum e3 = elem3;
        msgpack::pack(sbuf, e3);

-        msgpack::object_handle oh;
+        msgpack::unpacked result;
        std::size_t off = 0;

-        msgpack::unpack(oh, sbuf.str().data(), sbuf.str().size(), off);
-        std::cout << oh.get().as<my_enum>() << std::endl;
-        assert(oh.get().as<my_enum>() == elem1);
+        msgpack::unpack(result, sbuf.str().data(), sbuf.str().size(), off);
+        std::cout << result.get().as<my_enum>() << std::endl;
+        assert(result.get().as<my_enum>() == elem1);

-        msgpack::unpack(oh, sbuf.str().data(), sbuf.str().size(), off);
-        std::cout << oh.get().as<my_enum>() << std::endl;
-        assert(oh.get().as<my_enum>() == elem2);
+        msgpack::unpack(result, sbuf.str().data(), sbuf.str().size(), off);
+        std::cout << result.get().as<my_enum>() << std::endl;
+        assert(result.get().as<my_enum>() == elem2);

-        msgpack::unpack(oh, sbuf.str().data(), sbuf.str().size(), off);
-        std::cout << oh.get().as<my_enum>() << std::endl;
-        assert(oh.get().as<my_enum>() == elem3);
+        msgpack::unpack(result, sbuf.str().data(), sbuf.str().size(), off);
+        std::cout << result.get().as<my_enum>() << std::endl;
+        assert(result.get().as<my_enum>() == elem3);
    }
    {   // create object without zone
        msgpack::object obj(elem2);
--- a/example/cpp03/map_based_versionup.cpp
+++ b/example/cpp03/map_based_versionup.cpp
@@ -1,112 +0,0 @@
-// MessagePack for C++ example
-//
-// Copyright (C) 2015 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 <iostream>
-#include <iomanip>
-#include <sstream>
-#include <cassert>
-
-#include <msgpack.hpp>
-
-struct base1 {
-    base1():a("default") {}
-    std::string a;
-    MSGPACK_DEFINE_MAP(a);
-};
-
-struct v1 : base1 {
-    v1():name("default"), age(0) {}
-    std::string name;
-    int age;
-    MSGPACK_DEFINE_MAP(MSGPACK_BASE_MAP(base1), name, age);
-};
-
-struct base2 {
-    base2():a("default") {}
-    std::string a;
-    MSGPACK_DEFINE_MAP(a);
-};
-
-// Removed: base1, name
-// Added  : base2, address
-struct v2 : base2 {
-    v2(): age(0), address("default") {}
-    int age;
-    std::string address;
-    MSGPACK_DEFINE_MAP(MSGPACK_BASE_MAP(base2), age, address);
-};
-
-// The member variable "age" is in common between v1 and v2.
-
-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() {
-    { // pack v1, unpack, convert to v2
-        v1 v;
-        v.a = "ABC";
-        v.name = "John Smith";
-        v.age = 35;
-
-        std::stringstream ss;
-        msgpack::pack(ss, v);
-
-        print(ss.str());
-
-        std::string const& str = ss.str();
-        msgpack::object_handle oh = msgpack::unpack(str.data(), str.size());
-
-        msgpack::object obj = oh.get();
-        std::cout << obj << std::endl;
-
-        v2 newv = obj.as<v2>();
-
-        std::cout << "v2::a       " << newv.a << std::endl;
-        std::cout << "v2::age     " << newv.age << std::endl;
-        std::cout << "v2::address " << newv.address << std::endl;
-
-        // "age" is set from v1
-        assert(newv.a == "default");
-        assert(newv.age == 35);
-        assert(newv.address == "default");
-    }
-    { // create v2 object with zone, convert to v1
-        v2 v;
-        v.a = "DEF";
-        v.age = 42;
-        v.address = "Tokyo";
-
-        msgpack::zone z;
-        msgpack::object obj(v, z);
-        std::cout << obj << std::endl;
-
-        v1 newv = obj.as<v1>();
-
-        std::cout << "v1::a       " << newv.a << std::endl;
-        std::cout << "v1::name    " << newv.name << std::endl;
-        std::cout << "v1::age     " << newv.age << std::endl;
-
-        // "age" is set from v2
-        assert(newv.a == "default");
-        assert(newv.name == "default");
-        assert(newv.age == 42);
-    }
-}
--- a/example/cpp03/protocol.cpp
+++ b/example/cpp03/protocol.cpp
@@ -2,9 +2,17 @@
 //
 // Copyright (C) 2008-2015 FURUHASHI Sadayuki and 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

 #include <msgpack.hpp>
@@ -12,8 +20,6 @@
 #include <iostream>
 #include <sstream>

-// This example uses obsolete APIs
-// See protocol_new.cpp
 namespace myprotocol {
    using namespace msgpack::type;
    using msgpack::define;
@@ -57,9 +63,9 @@ int main(void)
    {
        std::string buffer(stream.str());

-        msgpack::object_handle oh =
-            msgpack::unpack(buffer.data(), buffer.size());
-        msgpack::object o = oh.get();
+        msgpack::unpacked result;
+        msgpack::unpack(result, buffer.data(), buffer.size());
+        msgpack::object o = result.get();

        myprotocol::Get req;
        o.convert(req);
@@ -85,9 +91,9 @@ int main(void)
    {
        std::string buffer(stream.str());

-        msgpack::object_handle oh =
-            msgpack::unpack(buffer.data(), buffer.size());
-        msgpack::object o = oh.get();
+        msgpack::unpacked result;
+        msgpack::unpack(result, buffer.data(), buffer.size());
+        msgpack::object o = result.get();


        myprotocol::MultiGet req;
--- a/example/cpp03/protocol_new.cpp
+++ b/example/cpp03/protocol_new.cpp
@@ -1,84 +0,0 @@
-// MessagePack for C++ example
-//
-// Copyright (C) 2015 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 <msgpack.hpp>
-#include <string>
-#include <iostream>
-#include <sstream>
-
-// This example uses obsolete APIs
-// See protocol_new.cpp
-namespace myprotocol {
-    struct Get {
-        Get() {}
-        Get(uint32_t f, const std::string& k) : flags(f), key(k) {}
-        uint32_t flags;
-        std::string key;
-        MSGPACK_DEFINE(flags, key);
-    };
-
-    typedef std::vector<Get> MultiGet;
-}
-
-
-int main(void)
-{
-    // send Get request
-    std::stringstream stream;
-    {
-        myprotocol::Get req;
-        req.flags = 0;
-        req.key   = "key0";
-        msgpack::pack(stream, req);
-    }
-
-    stream.seekg(0);
-
-    // receive Get request
-    {
-        std::string buffer(stream.str());
-
-        msgpack::object_handle oh =
-            msgpack::unpack(buffer.data(), buffer.size());
-        msgpack::object o = oh.get();
-
-        myprotocol::Get req;
-        o.convert(req);
-        std::cout << "received: " << o << std::endl;
-    }
-
-
-    stream.str("");
-
-
-    // send MultiGet request
-    {
-        myprotocol::MultiGet req;
-        req.push_back( myprotocol::Get(1, "key1") );
-        req.push_back( myprotocol::Get(2, "key2") );
-        req.push_back( myprotocol::Get(3, "key3") );
-        msgpack::pack(stream, req);
-    }
-
-    stream.seekg(0);
-
-    // receive MultiGet request
-    {
-        std::string buffer(stream.str());
-
-        msgpack::object_handle oh =
-            msgpack::unpack(buffer.data(), buffer.size());
-        msgpack::object o = oh.get();
-
-
-        myprotocol::MultiGet req;
-        o.convert(req);
-        std::cout << "received: " << o << std::endl;
-    }
-}
--- a/example/cpp03/reuse_zone.cpp
+++ b/example/cpp03/reuse_zone.cpp
@@ -2,9 +2,17 @@
 //
 // Copyright (C) 2015 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

 #include <iostream>
@@ -31,13 +39,9 @@ int main() {
    std::size_t offset = 0;

    // msgpack array is constructed on z.
-    std::string const& ps = ss.str();
-    msgpack::object obj = msgpack::unpack(z, ps.data(), ps.size(), offset);
-    std::cout << obj << std::endl;
+    msgpack::object obj = msgpack::unpack(z, ss.str().data(), ss.str().size(), offset);
    assert(obj.as<std::vector<int> >() == v);

    // msgpack str is constructed on z.
-    std::string const& str = msgpack::unpack(z, ps.data(), ps.size(), offset).as<std::string>();
-    std::cout << str << std::endl;
-    assert(str == s);
+    assert(msgpack::unpack(z, ss.str().data(), ss.str().size(), offset).as<std::string>() == s);
 }
--- a/example/cpp03/simple.cpp
+++ b/example/cpp03/simple.cpp
@@ -2,9 +2,17 @@
 //
 // Copyright (C) 2008-2015 FURUHASHI Sadayuki and 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

 #include <msgpack.hpp>
@@ -27,10 +35,12 @@ int main(void)
    // deserialize the buffer into msgpack::object instance.
    std::string str(buffer.str());

-    msgpack::object_handle oh = msgpack::unpack(str.data(), str.size());
+    msgpack::unpacked result;

-    // deserialized object is valid during the msgpack::object_handle instance alive.
-    msgpack::object deserialized = oh.get();
+    msgpack::unpack(result, str.data(), str.size());
+
+    // deserialized object is valid during the msgpack::unpacked instance alive.
+    msgpack::object deserialized = result.get();

    // msgpack::object supports ostream.
    std::cout << deserialized << std::endl;
@@ -38,7 +48,7 @@ int main(void)
    // convert msgpack::object instance into the original type.
    // if the type is mismatched, it throws msgpack::type_error exception.
    msgpack::type::tuple<int, bool, std::string> dst;
-    deserialized.convert(dst);
+    deserialized.convert(&dst);

    return 0;
 }
--- a/example/cpp03/speed_test.cpp
+++ b/example/cpp03/speed_test.cpp
@@ -2,9 +2,17 @@
 //
 // Copyright (C) 2013-2015 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

 // g++ -std=c++11 -O3 -g -Ipath_to_msgpack_src -Ipath_to_boost speed_test.cc -Lpath_to_boost_lib -lboost_timer -lboost_system
@@ -37,11 +45,11 @@ void test_map_pack_unpack() {
    buffer.seekg(0);
    std::string str(buffer.str());

-    msgpack::object_handle oh;
-    std::cout << "Start unpacking...by void unpack(object_handle& oh, const char* data, size_t len)" << std::endl;
+    msgpack::unpacked unpacked;
+    std::cout << "Start unpacking...by void unpack(unpacked& result, const char* data, size_t len)" << std::endl;
    {
        boost::timer::cpu_timer timer;
-        msgpack::unpack(oh, str.data(), str.size());
+        msgpack::unpack(unpacked, str.data(), str.size());
        std::string result = timer.format();
        std::cout << result << std::endl;
    }
@@ -50,7 +58,7 @@ void test_map_pack_unpack() {
    std::cout << "Start converting..." << std::endl;
    {
        boost::timer::cpu_timer timer;
-        oh.get().convert(m2);
+        unpacked.get().convert(&m2);
        std::string result = timer.format();
        std::cout << result << std::endl;
    }
--- a/example/cpp03/speed_test_nested_array.cpp
+++ b/example/cpp03/speed_test_nested_array.cpp
@@ -2,9 +2,17 @@
 //
 // Copyright (C) 2013-2015 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

 // g++ -std=c++11 -O3 -g -Ipath_to_msgpack_src -Ipath_to_boost speed_test.cc -Lpath_to_boost_lib -lboost_timer -lboost_system
@@ -21,7 +29,7 @@ template <typename T, std::size_t level>
 struct vecvec {
    typedef std::vector<typename vecvec<T, level - 1>::type> type;
    static void fill(type& v, std::size_t num_of_elems, T const& val) {
-        for (std::size_t elem = 0; elem < num_of_elems; ++elem) {
+        for (int elem = 0; elem < num_of_elems; ++elem) {
            typename vecvec<T, level - 1>::type child;
            vecvec<T, level - 1>::fill(child, num_of_elems, val);
            v.push_back(child);
@@ -33,7 +41,7 @@ template <typename T>
 struct vecvec<T, 0> {
    typedef std::vector<T> type;
    static void fill(type& v, std::size_t num_of_elems, T const& val) {
-        for (std::size_t elem = 0; elem < num_of_elems; ++elem) {
+        for (int elem = 0; elem < num_of_elems; ++elem) {
            v.push_back(val);
        }
    }
@@ -42,9 +50,9 @@ struct vecvec<T, 0> {
 void test_array_of_array() {
    std::cout << "[TEST][array_of_array]" << std::endl;
    // setup
-    int const depth = 4;
+    int const depth = 16;
    std::cout << "Setting up array data..." << std::endl;
-    vecvec<int, depth>::type v1;
+    typename vecvec<int, depth>::type v1;
    vecvec<int, depth>::fill(v1, 3, 42);

    std::cout << "Start packing..." << std::endl;
@@ -60,20 +68,20 @@ void test_array_of_array() {
    buffer.seekg(0);
    std::string str(buffer.str());

-    msgpack::object_handle oh;
-    std::cout << "Start unpacking...by void unpack(object_handle& oh, const char* data, size_t len)" << std::endl;
+    msgpack::unpacked unpacked;
+    std::cout << "Start unpacking...by void unpack(unpacked& result, const char* data, size_t len)" << std::endl;
    {
        boost::timer::cpu_timer timer;
-        msgpack::unpack(oh, str.data(), str.size());
+        msgpack::unpack(unpacked, str.data(), str.size());
        std::string result = timer.format();
        std::cout << result << std::endl;
    }
    std::cout << "Unpack finished..." << std::endl;
-    vecvec<int, depth>::type v2;
+    typename vecvec<int, depth>::type v2;
    std::cout << "Start converting..." << std::endl;
    {
        boost::timer::cpu_timer timer;
-        oh.get().convert(v2);
+        unpacked.get().convert(&v2);
        std::string result = timer.format();
        std::cout << result << std::endl;
    }
--- a/example/cpp03/stream.cpp
+++ b/example/cpp03/stream.cpp
@@ -2,9 +2,17 @@
 //
 // Copyright (C) 2008-2015 FURUHASHI Sadayuki and 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

 #include <msgpack.hpp>
@@ -16,12 +24,6 @@
 #include <errno.h>
 #include <pthread.h>

-#if defined(_MSC_VER) || defined(__MINGW32__)
-#include <io.h>
-#include <fcntl.h>
-#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
-#endif // _MSC_VER || __MINGW32__
-
 class Server {
 public:
    Server(int sock) : m_sock(sock) { }
@@ -49,10 +51,10 @@ public:

        m_pac.buffer_consumed(count);

-        msgpack::object_handle oh;
-        while (m_pac.next(oh)) {
-            msgpack::object msg = oh.get();
-            unique_zone& life = oh.zone();
+        msgpack::unpacked result;
+        while (m_pac.next(&result)) {
+            msgpack::object msg = result.get();
+            unique_zone& life = result.zone();
            process_message(msg, life);
        }

@@ -120,7 +122,7 @@ private:
 int main(void)
 {
    int pair[2];
-    if (pipe(pair) != 0) return -1;
+    pipe(pair);

    // run server thread
    Server srv(pair[0]);
--- a/example/cpp11/CMakeLists.txt
+++ b/example/cpp11/CMakeLists.txt
@@ -1,38 +0,0 @@
-IF (MSGPACK_CXX11 OR MSGPACK_CXX14 OR MSGPACK_CXX17)
-    LIST (APPEND exec_PROGRAMS
-        container.cpp
-        non_def_con_class.cpp
-    )
-
-    IF ("${MSGPACK_DEFAULT_API_VERSION}" GREATER "1")
-        LIST (APPEND exec_PROGRAMS
-            socket_stream_example.cpp
-        )
-    ENDIF ()
-
-    FOREACH (source_file ${exec_PROGRAMS})
-        GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
-        ADD_EXECUTABLE (
-            ${source_file_we}
-            ${source_file}
-        )
-        TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
-            msgpackc-cxx
-        )
-        IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
-        ENDIF ()
-
-        IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
-        ENDIF ()
-
-        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-            IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-                STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-            ELSE ()
-                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX")
-            ENDIF ()
-        ENDIF ()
-    ENDFOREACH ()
-ENDIF ()
--- a/example/cpp11/container.cpp
+++ b/example/cpp11/container.cpp
@@ -2,9 +2,17 @@
 //
 // Copyright (C) 2015 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //

 #include <iostream>
@@ -21,16 +29,15 @@
 #include <msgpack.hpp>

 void array() {
-    std::array<int, 5> a { { 1, 2, 3, 4, 5 } };
+    std::array<int, 5> a { 1, 2, 3, 4, 5 };
    std::stringstream ss;
    msgpack::pack(ss, a);

-    auto const& str = ss.str();
-    auto oh = msgpack::unpack(str.data(), str.size());
-    auto obj = oh.get();
+    msgpack::unpacked und = msgpack::unpack(ss.str().data(), ss.str().size());
+    msgpack::object obj = und.get();
+    std::array<int, 5> const& new_a = obj.as<std::array<int, 5>>();

-    std::cout << obj << std::endl;
-    assert((obj.as<std::array<int, 5>>()) == a);
+    assert(new_a == a);
 }

 void tuple() {
@@ -38,11 +45,8 @@ void tuple() {
    std::stringstream ss;
    msgpack::pack(ss, t);

-    auto const& str = ss.str();
-    auto oh = msgpack::unpack(str.data(), str.size());
-    auto obj = oh.get();
-
-    std::cout << obj << std::endl;
+    auto und = msgpack::unpack(ss.str().data(), ss.str().size());
+    auto obj = und.get();
    assert(obj.as<decltype(t)>() == t);
 }

@@ -51,12 +55,8 @@ void unordered_map() {
    std::stringstream ss;
    msgpack::pack(ss, m);

-    auto const& str = ss.str();
-    auto oh = msgpack::unpack(str.data(), str.size());
-    msgpack::object obj = oh.get();
-
-    std::cout << obj << std::endl;
-    assert(obj.as<decltype(m)>() == m);
+    auto und = msgpack::unpack(ss.str().data(), ss.str().size());
+    assert(und.get().as<decltype(m)>() == m);
 }

 void unordered_set() {
@@ -64,12 +64,7 @@ void unordered_set() {
    std::stringstream ss;
    msgpack::pack(ss, s);

-    auto const& str = ss.str();
-    auto oh = msgpack::unpack(str.data(), str.size());
-    auto obj = oh.get();
-
-    std::cout << obj << std::endl;
-    assert(obj.as<decltype(s)>() == s);
+    assert(msgpack::unpack(ss.str().data(), ss.str().size()).get().as<decltype(s)>() == s);
 }

 void forward_list() {
@@ -78,16 +73,11 @@ void forward_list() {
    std::stringstream ss;
    msgpack::pack(ss, f);

-    auto const& str = ss.str();
-    auto oh = msgpack::unpack(str.data(), str.size());
-    auto obj = oh.get();
-
-    std::cout << obj << std::endl;
-    assert(obj.as<type>() == f);
+    assert(msgpack::unpack(ss.str().data(), ss.str().size()).get().as<type>() == f);
 }

 void combi() {
-    std::array<int, 5>                   a { { 1, 2, 3, 4, 5 } };
+    std::array<int, 5>                   a { 1, 2, 3, 4, 5 };
    std::tuple<bool, std::string, int>   t {true, "ABC", 42};
    std::unordered_map<std::string, int> m { {"ABC", 1}, {"DEF", 3} };
    std::unordered_set<std::string>      s { "ABC", "DEF" };
@@ -101,52 +91,11 @@ void combi() {
    msgpack::pack(ss, f);

    std::size_t offset = 0;
-    std::cout << "offset: " << offset << std::endl;
-    {
-        auto const& str = ss.str();
-        auto oh = msgpack::unpack(str.data(), str.size(), offset);
-        auto obj = oh.get();
-
-        std::cout << obj << std::endl;
-        assert(obj.as<decltype(a)>() == a);
-    }
-    std::cout << "offset: " << offset << std::endl;
-    {
-        auto const& str = ss.str();
-        auto oh = msgpack::unpack(str.data(), str.size(), offset);
-        auto obj = oh.get();
-
-        std::cout << obj << std::endl;
-        assert(obj.as<decltype(t)>() == t);
-    }
-    std::cout << "offset: " << offset << std::endl;
-    {
-        auto const& str = ss.str();
-        auto oh = msgpack::unpack(str.data(), str.size(), offset);
-        auto obj = oh.get();
-
-        std::cout << obj << std::endl;
-        assert(obj.as<decltype(m)>() == m);
-    }
-    std::cout << "offset: " << offset << std::endl;
-    {
-        auto const& str = ss.str();
-        auto oh = msgpack::unpack(str.data(), str.size(), offset);
-        auto obj = oh.get();
-
-        std::cout << obj << std::endl;
-        assert(obj.as<decltype(s)>() == s);
-    }
-    std::cout << "offset: " << offset << std::endl;
-    {
-        auto const& str = ss.str();
-        auto oh = msgpack::unpack(str.data(), str.size(), offset);
-        auto obj = oh.get();
-
-        std::cout << obj << std::endl;
-        assert(obj.as<decltype(f)>() == f);
-    }
-    std::cout << "offset: " << offset << std::endl;
+    assert(msgpack::unpack(ss.str().data(), ss.str().size(), offset).get().as<decltype(a)>() == a);
+    assert(msgpack::unpack(ss.str().data(), ss.str().size(), offset).get().as<decltype(t)>() == t);
+    assert(msgpack::unpack(ss.str().data(), ss.str().size(), offset).get().as<decltype(m)>() == m);
+    assert(msgpack::unpack(ss.str().data(), ss.str().size(), offset).get().as<decltype(s)>() == s);
+    assert(msgpack::unpack(ss.str().data(), ss.str().size(), offset).get().as<decltype(f)>() == f);
 }

 int main() {
--- a/example/cpp11/non_def_con_class.cpp
+++ b/example/cpp11/non_def_con_class.cpp
@@ -1,51 +0,0 @@
-// MessagePack for C++ example
-//
-// Copyright (C) 2015 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 <cassert>
-#include <memory>
-#include <iostream>
-
-#include <msgpack.hpp>
-
-struct my {
-    my() = delete;
-
-    // target class should be either copyable or movable (or both).
-    my(my const&) = delete;
-    my(my&&) = default;
-
-    my(int a):a(a) {}
-    int a;
-    MSGPACK_DEFINE(a);
-};
-
-namespace msgpack {
-MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS) {
-namespace adaptor {
-
-template<>
-struct as<my> {
-    my operator()(msgpack::object const& o) const {
-        if (o.type != msgpack::type::ARRAY) throw msgpack::type_error();
-        if (o.via.array.size != 1) throw msgpack::type_error();
-        return my(o.via.array.ptr[0].as<int>());
-    }
-};
-
-} // namespace adaptor
-} // MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS)
-} // namespace msgpack
-
-int main() {
-    my m1(42);
-    msgpack::zone z;
-    msgpack::object obj(m1, z);
-    std::cout << obj << std::endl;
-    assert(m1.a == obj.as<my>().a);
-}
--- a/example/cpp11/socket_stream_example.cpp
+++ b/example/cpp11/socket_stream_example.cpp
@@ -1,157 +0,0 @@
-#include <iostream>
-#include <sstream>
-#include <msgpack.hpp>
-
-struct json_like_visitor : msgpack::v2::null_visitor {
-    json_like_visitor(std::string& s):m_s(s), m_ref(false) {} // m_ref is false by default
-
-    bool visit_nil() {
-        m_s += "null";
-        return true;
-    }
-    bool visit_boolean(bool v) {
-        if (v) m_s += "true";
-        else m_s += "false";
-        return true;
-    }
-    bool visit_positive_integer(uint64_t v) {
-        std::stringstream ss;
-        ss << v;
-        m_s += ss.str();
-        return true;
-    }
-    bool visit_negative_integer(int64_t v) {
-        std::stringstream ss;
-        ss << v;
-        m_s += ss.str();
-        return true;
-    }
-    bool visit_str(const char* v, uint32_t size) {
-        // I omit escape process.
-        m_s += '"' + std::string(v, size) + '"';
-        return true;
-    }
-    bool start_array(uint32_t /*num_elements*/) {
-        m_s += "[";
-        return true;
-    }
-    bool end_array_item() {
-        m_s += ",";
-        return true;
-    }
-    bool end_array() {
-        m_s.erase(m_s.size() - 1, 1); // remove the last ','
-        m_s += "]";
-        return true;
-    }
-    bool start_map(uint32_t /*num_kv_pairs*/) {
-        m_s += "{";
-        return true;
-    }
-    bool end_map_key() {
-        m_s += ":";
-        return true;
-    }
-    bool end_map_value() {
-        m_s += ",";
-        return true;
-    }
-    bool end_map() {
-        m_s.erase(m_s.size() - 1, 1); // remove the last ','
-        m_s += "}";
-        return true;
-    }
-    void parse_error(size_t /*parsed_offset*/, size_t /*error_offset*/) {
-        std::cerr << "parse error"<<std::endl;
-    }
-    void insufficient_bytes(size_t /*parsed_offset*/, size_t /*error_offset*/) {
-        std::cout << "insufficient bytes"<<std::endl;
-    }
-    std::string& m_s;
-
-    // These two functions are required by parser.
-    void set_referenced(bool ref) { m_ref = ref; }
-    bool referenced() const { return m_ref; }
-    bool m_ref;
-};
-
-struct do_nothing {
-    void operator()(char* /*buffer*/) {
-    }
-};
-
-class json_like_printer : public msgpack::parser<json_like_printer, do_nothing>,
-                          public json_like_visitor {
-    typedef parser<json_like_printer, do_nothing> parser_t;
-public:
-    json_like_printer(std::size_t initial_buffer_size = MSGPACK_UNPACKER_INIT_BUFFER_SIZE)
-        :parser_t(do_nothing_, initial_buffer_size),
-         json_like_visitor(json_str_) {
-    }
-
-    json_like_visitor& visitor() { return *this; }
-    void print() { std::cout << json_str_ << std::endl; json_str_.clear();}
-private:
-    do_nothing do_nothing_;
-    std::string json_str_;
-};
-
-template <typename T>
-struct ref_buffer {
-    ref_buffer(T& t):t(t) {}
-    void write(char const* ptr, std::size_t len) {
-        if (len > t.buffer_capacity()) {
-            t.reserve_buffer(len - t.buffer_capacity());
-        }
-        std::memcpy(t.buffer(), ptr, len);
-        t.buffer_consumed(len);
-    }
-    T& t;
-};
-
-#define BUFFERING_SIZE_MAX 100
-
-//simulates streamed content (a socket for example)
-bool produce( std::stringstream & ss, char* buff, std::size_t& size)
-{
-    ss.read(buff, BUFFERING_SIZE_MAX);
-    size = static_cast<std::size_t>(ss.gcount());
-    return (size > 0);
-}
-
-//shows how you can treat data 
-void consume( const char* buff, const std::size_t size, 
-    ref_buffer<json_like_printer> & rb,
-    json_like_printer & jp
-    )
-{
-    rb.write(buff,size);
-    while( jp.next() )
-    {
-        //here we print the data, you could do any wanted processing
-        jp.print();
-    }  
-}
-
-int main() {
-
-    std::vector<std::vector<int>> vvi1 { { 1,2,3,4,5}, { 6,7,8,9,10} }; 
-    std::vector<std::vector<int>> vvi2 { { 11,12,13,14,15}, { 16,17,18,19,20} };
-
-    std::stringstream ss;
-    
-    msgpack::pack(ss, vvi1);
-    msgpack::pack(ss, vvi2);
-
-    char buffer[BUFFERING_SIZE_MAX];
-    std::size_t size = 0;
-
-    json_like_printer jp(1); // set initial buffer size explicitly
-    ref_buffer<json_like_printer> rb(jp);
-
-    while( produce(ss,buffer,size) )
-    {
-        consume(buffer, size, rb, jp);
-    }
-
-}
--- a/example/x3/CMakeLists.txt
+++ b/example/x3/CMakeLists.txt
@@ -1,64 +0,0 @@
-IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1)
-    FIND_PACKAGE (Boost REQUIRED COMPONENTS context system)
-    FIND_PACKAGE (Threads REQUIRED)
-
-    LIST (APPEND exec_PROGRAMS
-        unpack.cpp
-        parse.cpp
-    )
-    LIST (APPEND with_boost_PROGRAMS
-        stream_unpack.cpp
-    )
-    FOREACH (source_file ${exec_PROGRAMS})
-        GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
-        ADD_EXECUTABLE (
-            ${source_file_we}
-            ${source_file}
-        )
-        TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE msgpackc-cxx)
-
-        IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
-        ENDIF ()
-
-        IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
-        ENDIF ()
-
-        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-            IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-                STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-            ELSE ()
-                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX")
-            ENDIF ()
-        ENDIF ()
-    ENDFOREACH ()
-    FOREACH (source_file ${with_boost_PROGRAMS})
-        GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
-        ADD_EXECUTABLE (
-            ${source_file_we}
-            ${source_file}
-        )
-        TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
-            msgpackc-cxx
-            Boost::context
-            Boost::system
-            Threads::Threads
-        )
-        IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
-        ENDIF ()
-
-        IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
-        ENDIF ()
-
-        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-            IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-                STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-            ELSE ()
-                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX")
-            ENDIF ()
-        ENDIF ()
-    ENDFOREACH ()
-ENDIF ()
--- a/example/x3/parse.cpp
+++ b/example/x3/parse.cpp
@@ -1,125 +0,0 @@
-// 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 <iostream>
-#include <sstream>
-#include <cassert>
-
-// MSGPACK_USE_X3_PARSE should be defined before including msgpack.hpp
-// It usually defined as a compiler option as -DMSGPACK_USE_X3_PARSE.
-
-#include <msgpack.hpp>
-
-struct json_like_visitor : msgpack::v2::null_visitor {
-    json_like_visitor(std::string& s):m_s(s) {}
-
-    bool visit_nil() {
-        m_s += "null";
-        return true;
-    }
-    bool visit_boolean(bool v) {
-        if (v) m_s += "true";
-        else m_s += "false";
-        return true;
-    }
-    bool visit_positive_integer(uint64_t v) {
-        std::stringstream ss;
-        ss << v;
-        m_s += ss.str();
-        return true;
-    }
-    bool visit_negative_integer(int64_t v) {
-        std::stringstream ss;
-        ss << v;
-        m_s += ss.str();
-        return true;
-    }
-    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();
-        return true;
-    }
-    bool visit_str(const char* v, uint32_t size) {
-        m_s += '"' + std::string(v, size) + '"';
-        return true;
-    }
-    bool start_array(uint32_t /*num_elements*/) {
-        m_s += "[";
-        return true;
-    }
-    bool end_array_item() {
-        m_s += ",";
-        return true;
-    }
-    bool end_array() {
-        m_s.erase(m_s.size() - 1, 1); // remove the last ','
-        m_s += "]";
-        return true;
-    }
-    bool start_map(uint32_t /*num_kv_pairs*/) {
-        m_s += "{";
-        return true;
-    }
-    bool end_map_key() {
-        m_s += ":";
-        return true;
-    }
-    bool end_map_value() {
-        m_s += ",";
-        return true;
-    }
-    bool end_map() {
-        m_s.erase(m_s.size() - 1, 1); // remove the last ','
-        m_s += "}";
-        return true;
-    }
-    void parse_error(size_t /*parsed_offset*/, size_t /*error_offset*/) {
-    }
-    void insufficient_bytes(size_t /*parsed_offset*/, size_t /*error_offset*/) {
-    }
-    std::string& m_s;
-};
-
-int main() {
-    std::stringstream ss;
-    std::map<std::string, std::vector<int>> v1 {
-        { "ABC", { 1, 2, 3 } },
-        { "DEFG", { 4, 5 } }
-    };
-    std::vector<std::string> v2 {
-        "HIJ", "KLM", "NOP"
-    };
-    msgpack::pack(ss, v1);
-    msgpack::pack(ss, v2);
-
-    std::string const& buf = ss.str();
-    auto it = buf.begin();
-    auto end = buf.end();
-    {
-        std::string str;
-        bool ret = msgpack::parse(it, end, json_like_visitor(str));
-        // it is updated here.
-        assert(ret);
-        std::cout << str << std::endl;
-    }
-    {
-        std::string str;
-        bool ret = msgpack::parse(it, end, json_like_visitor(str));
-        // it is updated here.
-        assert(ret);
-        std::cout << str << std::endl;
-    }
-}
--- a/example/x3/stream_unpack.cpp
+++ b/example/x3/stream_unpack.cpp
@@ -1,248 +0,0 @@
-// 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 <iostream>
-#include <sstream>
-#include <cassert>
-#include <thread>
-
-// MSGPACK_USE_X3_PARSE should be defined before including msgpack.hpp
-// It usually defined as a compiler option as -DMSGPACK_USE_X3_PARSE.
-
-//#define MSGPACK_USE_X3_PARSE
-
-#include <msgpack.hpp>
-
-#include <boost/asio.hpp>
-#include <boost/coroutine2/all.hpp>
-
-#if defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#endif // defined(__clang__)
-
-#include <boost/spirit/home/support/multi_pass.hpp>
-
-#if defined(__clang__)
-#pragma GCC diagnostic pop
-#endif // defined(__clang__)
-
-namespace as = boost::asio;
-namespace x3 = boost::spirit::x3;
-namespace coro2 = boost::coroutines2;
-
-using pull_type = coro2::asymmetric_coroutine<std::shared_ptr<std::vector<char>>>::pull_type;
-
-// iterator fetching data from coroutine2.
-class buffered_iterator : public std::iterator<std::input_iterator_tag, char> {
-public:
-    using pointer_t = typename iterator::pointer;
-    using reference_t = typename iterator::reference;
-
-    explicit buffered_iterator(pull_type& source) noexcept
-        : source_{ &source } {
-        fetch_();
-    }
-    buffered_iterator() = default;
-
-    bool operator==(buffered_iterator const& other) const noexcept {
-        if (!other.source_ && !source_ && !other.buf_ && !buf_) return true;
-        return other.it_ == it_;
-    }
-
-    bool operator!=(buffered_iterator const& other) const noexcept {
-        return !(other == *this);
-    }
-
-    buffered_iterator & operator++() {
-        increment_();
-        return * this;
-    }
-
-    buffered_iterator operator++(int) = delete;
-
-    reference_t operator*() noexcept {
-        return *it_;
-    }
-
-    pointer_t operator->() noexcept {
-        return std::addressof(*it_);
-    }
-
-private:
-    void fetch_() noexcept {
-        BOOST_ASSERT( nullptr != source_);
-        if (*source_) {
-            buf_ = source_->get();
-            it_ = buf_->begin();
-        }
-        else {
-            source_ = nullptr;
-            buf_.reset();
-        }
-    }
-
-    void increment_() {
-        BOOST_ASSERT( nullptr != source_);
-        BOOST_ASSERT(*source_);
-        if (++it_ == buf_->end()) {
-            (*source_)();
-            fetch_();
-        }
-    }
-
-private:
-    pull_type* source_{ nullptr };
-    std::shared_ptr<std::vector<char>> buf_;
-    std::vector<char>::iterator it_;
-};
-
-// session class that corresponding to each client
-class session : public std::enable_shared_from_this<session> {
-public:
-    session(as::ip::tcp::socket socket)
-        : socket_(std::move(socket)) {
-    }
-
-    void start() {
-        sink_ = std::make_shared<coro2::asymmetric_coroutine<std::shared_ptr<std::vector<char>>>::push_type>(
-            [&, this](pull_type& source) {
-                // *1 is started when the first sink is called.
-
-                std::cout << "session started" << std::endl;
-                do_read();
-                source();
-
-                // use buffered_iterator here
-                // b is incremented in msgpack::unpack() and fetch data from sink
-                // via coroutine2 mechanism
-                auto b = boost::spirit::make_default_multi_pass(buffered_iterator(source));
-                auto e = boost::spirit::make_default_multi_pass(buffered_iterator());
-
-                // This is usually an infinity look, but for test, loop is finished when
-                // two message pack data is processed.
-                for (int i = 0; i != 2; ++i) {
-                    auto oh = msgpack::unpack(b, e);
-                    std::cout << oh.get() << std::endl;
-                }
-            }
-        );
-        // send dummy data to start *1
-        (*sink_)({});
-    }
-
-private:
-    void do_read() {
-        std::cout << "session do_read() is called" << std::endl;
-        auto self(shared_from_this());
-        auto data = std::make_shared<std::vector<char>>(static_cast<std::size_t>(max_length));
-        socket_.async_read_some(
-            boost::asio::buffer(*data),
-            [this, self, data]
-            (boost::system::error_code ec, std::size_t length) {
-                if (!ec) {
-                    data->resize(length);
-                    (*sink_)(data);
-                    do_read();
-                }
-            }
-        );
-    }
-
-    as::ip::tcp::socket socket_;
-    static constexpr std::size_t const max_length = 1024;
-    std::shared_ptr<coro2::asymmetric_coroutine<std::shared_ptr<std::vector<char>>>::push_type> sink_;
-};
-
-class server {
-public:
-    server(
-        as::io_service& ios,
-        std::uint16_t port)
-        : acceptor_(ios, as::ip::tcp::endpoint(as::ip::tcp::v4(), port)),
-          socket_(ios) {
-        do_accept();
-        std::cout << "server start accept" << std::endl;
-        ios.run();
-    }
-
-private:
-    void do_accept() {
-        acceptor_.async_accept(
-            socket_,
-            [this](boost::system::error_code ec) {
-                if (!ec) {
-                    std::make_shared<session>(std::move(socket_))->start();
-                }
-                // for test, only one session is accepted.
-                // do_accept();
-            }
-        );
-    }
-
-    as::ip::tcp::acceptor acceptor_;
-    as::ip::tcp::socket socket_;
-};
-
-int main() {
-    std::thread srv(
-        []{
-            boost::asio::io_service ios;
-            server s(ios, 12345);
-        }
-    );
-
-    std::thread cli(
-        []{
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-            std::cout << "client start" << std::endl;
-
-            std::stringstream ss;
-            std::map<std::string, std::vector<int>> v1 {
-                { "ABC", { 1, 2, 3 } },
-                { "DEFG", { 4, 5 } }
-            };
-            std::vector<std::string> v2 {
-                "HIJ", "KLM", "NOP"
-                    };
-            msgpack::pack(ss, v1);
-            msgpack::pack(ss, v2);
-
-            auto send_data = ss.str();
-
-            boost::asio::io_service ios;
-            as::ip::tcp::resolver::query q("127.0.0.1", "12345");
-            as::ip::tcp::resolver r(ios);
-            auto it = r.resolve(q);
-
-            std::cout << "client connect" << std::endl;
-            as::ip::tcp::socket s(ios);
-            as::connect(s, it);
-
-
-            std::size_t const size = 5;
-            std::size_t rest = send_data.size();
-            std::size_t index = 0;
-            while (rest != 0) {
-                std::cout << "client send data" << std::endl;
-                auto send_size = size < rest ? size : rest;
-                as::write(s, as::buffer(&send_data[index], send_size));
-                rest -= send_size;
-                index += send_size;
-                std::cout << "client wait" << std::endl;
-                std::this_thread::sleep_for(std::chrono::seconds(1));
-            }
-        }
-    );
-
-    cli.join();
-    std::cout << "client joinded" << std::endl;
-    srv.join();
-    std::cout << "server joinded" << std::endl;
-}
--- a/example/x3/unpack.cpp
+++ b/example/x3/unpack.cpp
@@ -1,43 +0,0 @@
-// 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 <iostream>
-#include <sstream>
-#include <cassert>
-
-// MSGPACK_USE_X3_PARSE should be defined before including msgpack.hpp
-// It usually defined as a compiler option as -DMSGPACK_USE_X3_PARSE.
-
-#include <msgpack.hpp>
-
-int main() {
-    std::stringstream ss;
-    std::map<std::string, std::vector<int>> v1 {
-        { "ABC", { 1, 2, 3 } },
-        { "DEFG", { 4, 5 } }
-    };
-    std::vector<std::string> v2 {
-        "HIJ", "KLM", "NOP"
-    };
-    msgpack::pack(ss, v1);
-    msgpack::pack(ss, v2);
-
-    std::string const& buf = ss.str();
-    auto it = buf.begin();
-    auto end = buf.end();
-    {
-        auto oh = msgpack::unpack(it, end);
-        // it is updated here.
-        assert(v1 == (oh.get().as<std::map<std::string, std::vector<int>>>()));
-    }
-    {
-        auto oh = msgpack::unpack(it, end);
-        assert(v2 == oh.get().as<std::vector<std::string>>());
-    }
-}
--- a/fuzz/CMakeLists.txt
+++ b/fuzz/CMakeLists.txt
@@ -1,38 +0,0 @@
-FIND_PACKAGE (Threads REQUIRED)
-FIND_PACKAGE (Boost REQUIRED COMPONENTS system filesystem unit_test_framework)
-
-LIST (APPEND check_PROGRAMS
-    regression_runner.cpp
-)
-
-FOREACH (source_file ${check_PROGRAMS})
-    GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
-    ADD_EXECUTABLE (
-        ${source_file_we}
-        ${source_file}
-    )
-
-    TARGET_COMPILE_DEFINITIONS (${source_file_we} PRIVATE
-        $<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>)
-
-    TARGET_LINK_LIBRARIES (${source_file_we}
-        msgpackc-cxx
-        Threads::Threads
-        Boost::filesystem
-        Boost::system
-        Boost::unit_test_framework
-    )
-
-    ADD_TEST (${source_file_we} ${source_file_we})
-
-    IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "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
@@ -1,49 +0,0 @@
-#include <boost/filesystem.hpp>
-
-// Use parameterized tests instead of modern data-driven test cases
-// because BOOST_DATA_TEST_CASE requires C++11 or newer. See:
-// - https://www.boost.org/doc/libs/1_76_0/libs/test/doc/html/boost_test/tests_organization/test_cases/param_test.html
-// - https://www.boost.org/doc/libs/1_76_0/libs/test/doc/html/boost_test/tests_organization/test_cases/test_case_generation.html
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/parameterized_test.hpp>
-
-#include <fstream>
-#include <string>
-#include <vector>
-
-#include "unpack_pack_fuzzer.cpp"
-
-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;
-}
-
-void UnpackPackFuzzerRegressionTest(const std::string& fpath) {
-  std::ifstream in(fpath.c_str(), std::ios_base::binary);
-  if (!in) {
-    BOOST_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());
-  BOOST_REQUIRE(in);
-  BOOST_REQUIRE_EQUAL(0, LLVMFuzzerTestOneInput(reinterpret_cast<const uint8_t *>(bytes.data()), bytes.size()));
-}
-
-boost::unit_test::test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])
-{
-  std::vector<std::string> files = ListDirectory("../../fuzz/unpack_pack_fuzzer_regressions");
-  boost::unit_test::framework::master_test_suite().add(BOOST_PARAM_TEST_CASE(&UnpackPackFuzzerRegressionTest, files.begin(), files.end()));
-  return 0;
-}
--- a/fuzz/unpack_pack_fuzzer.cpp
+++ b/fuzz/unpack_pack_fuzzer.cpp
@@ -1,27 +0,0 @@
-#include <msgpack.hpp>
-
-// The function's signature must NOT be changed since other projects rely on it:
-// - libFuzzer
-// - AFL++
-// - Google's oss-fuzz (uses the previous two ones)
-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,
-                                                      MSGPACK_NULLPTR,
-                                                      MSGPACK_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
@@ -1 +0,0 @@
-<EFBFBD>
--- a/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject
+++ b/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject
@@ -1 +0,0 @@
-<EFBFBD>
--- a/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting
+++ b/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting
@@ -1,2 +0,0 @@
-<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.h
+++ b/include/msgpack.h
@@ -0,0 +1,32 @@
+/*
+ * MessagePack for C
+ *
+ * Copyright (C) 2008-2009 FURUHASHI Sadayuki
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+/**
+ * @defgroup msgpack MessagePack C
+ * @{
+ * @}
+ */
+
+#include "msgpack/util.h"
+#include "msgpack/object.h"
+#include "msgpack/zone.h"
+#include "msgpack/pack.h"
+#include "msgpack/unpack.h"
+#include "msgpack/sbuffer.h"
+#include "msgpack/vrefbuffer.h"
+#include "msgpack/version.h"
+
--- a/include/msgpack.hpp
+++ b/include/msgpack.hpp
@@ -3,20 +3,23 @@
 //
 // Copyright (C) 2008-2009 FURUHASHI Sadayuki
 //
-//    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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //
 #include "msgpack/object.hpp"
 #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"
-#include "msgpack/type.hpp"
--- a/include/msgpack/adaptor/adaptor_base.hpp
+++ b/include/msgpack/adaptor/adaptor_base.hpp
@@ -1,19 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2015-2016 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_ADAPTOR_BASE_HPP
-#define MSGPACK_ADAPTOR_BASE_HPP
-
-#include "msgpack/adaptor/adaptor_base_decl.hpp"
-
-#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
@@ -1,17 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2016 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_ADAPTOR_BASE_DECL_HPP
-#define MSGPACK_ADAPTOR_BASE_DECL_HPP
-
-#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.hpp
+++ b/include/msgpack/adaptor/array_ref.hpp
@@ -1,17 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2008-2016 FURUHASHI Sadayuki and 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_ARRAY_REF_HPP
-#define MSGPACK_TYPE_ARRAY_REF_HPP
-
-#include "msgpack/adaptor/array_ref_decl.hpp"
-
-#include "msgpack/v1/adaptor/array_ref.hpp"
-
-#endif // MSGPACK_TYPE_ARRAY_REFL_HPP
--- a/include/msgpack/adaptor/array_ref_decl.hpp
+++ b/include/msgpack/adaptor/array_ref_decl.hpp
@@ -1,17 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2008-2016 FURUHASHI Sadayuki and 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_ARRAY_REF_DECL_HPP
-#define MSGPACK_TYPE_ARRAY_REF_DECL_HPP
-
-#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/bool.hpp
+++ b/include/msgpack/adaptor/bool.hpp
@@ -1,15 +1,58 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2008-2016 FURUHASHI Sadayuki and KONDO Takatoshi
+// Copyright (C) 2008-2009 FURUHASHI Sadayuki
 //
-//    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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //
 #ifndef MSGPACK_TYPE_BOOL_HPP
 #define MSGPACK_TYPE_BOOL_HPP

-#include "msgpack/v1/adaptor/bool.hpp"
+#include "msgpack/versioning.hpp"
+#include "msgpack/object_fwd.hpp"
+#include <vector>
+
+namespace msgpack {
+
+MSGPACK_API_VERSION_NAMESPACE(v1) {
+
+inline msgpack::object const& operator>> (msgpack::object const& o, bool& v)
+{
+    if(o.type != msgpack::type::BOOLEAN) { throw msgpack::type_error(); }
+    v = o.via.boolean;
+    return o;
+}
+
+template <typename Stream>
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const bool& v)
+{
+    if(v) { o.pack_true(); }
+    else { o.pack_false(); }
+    return o;
+}
+
+inline void operator<< (msgpack::object& o, bool v)
+{
+    o.type = msgpack::type::BOOLEAN;
+    o.via.boolean = v;
+}
+
+inline void operator<< (msgpack::object::with_zone& o, bool v)
+    { static_cast<msgpack::object&>(o) << v; }
+
+
+}  // MSGPACK_API_VERSION_NAMESPACE(v1)
+
+}  // namespace msgpack

 #endif // MSGPACK_TYPE_BOOL_HPP
--- a/include/msgpack/adaptor/bool_fwd.hpp
+++ b/include/msgpack/adaptor/bool_fwd.hpp
@@ -0,0 +1,39 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2008-2009 FURUHASHI Sadayuki
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+#ifndef MSGPACK_TYPE_BOOL_FWD_HPP
+#define MSGPACK_TYPE_BOOL_FWD_HPP
+
+#include "msgpack/versioning.hpp"
+#include "msgpack/object_fwd.hpp"
+
+namespace msgpack {
+
+MSGPACK_API_VERSION_NAMESPACE(v1) {
+
+msgpack::object const& operator>> (msgpack::object const& o, bool& v);
+template <typename Stream>
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const bool& v);
+void operator<< (msgpack::object& o, bool v);
+void operator<< (msgpack::object::with_zone& o, bool v);
+
+
+}  // MSGPACK_API_VERSION_NAMESPACE(v1)
+
+}  // namespace msgpack
+
+#endif // MSGPACK_TYPE_BOOL_FWD_HPP
--- a/include/msgpack/adaptor/boost/fusion.hpp
+++ b/include/msgpack/adaptor/boost/fusion.hpp
@@ -1,15 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2015 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_BOOST_FUSION_HPP
-#define MSGPACK_TYPE_BOOST_FUSION_HPP
-
-#include "msgpack/v1/adaptor/boost/fusion.hpp"
-
-#endif // MSGPACK_TYPE_BOOST_FUSION_HPP
--- a/include/msgpack/adaptor/boost/msgpack_variant.hpp
+++ b/include/msgpack/adaptor/boost/msgpack_variant.hpp
@@ -1,18 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2015-2016 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_BOOST_MSGPACK_VARIANT_HPP
-#define MSGPACK_TYPE_BOOST_MSGPACK_VARIANT_HPP
-
-#include "msgpack/adaptor/boost/msgpack_variant_decl.hpp"
-
-#include "msgpack/v1/adaptor/boost/msgpack_variant.hpp"
-//#include "msgpack/v2/adaptor/boost/msgpack_variant.hpp"
-
-#endif // MSGPACK_TYPE_BOOST_MSGPACK_VARIANT_HPP
--- a/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp
+++ b/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp
@@ -1,17 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2016 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_BOOST_MSGPACK_VARIANT_DECL_HPP
-#define MSGPACK_TYPE_BOOST_MSGPACK_VARIANT_DECL_HPP
-
-#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/boost/optional.hpp
+++ b/include/msgpack/adaptor/boost/optional.hpp
@@ -1,15 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2016 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_BOOST_OPTIONAL_HPP
-#define MSGPACK_TYPE_BOOST_OPTIONAL_HPP
-
-#include "msgpack/v1/adaptor/boost/optional.hpp"
-
-#endif // MSGPACK_TYPE_BOOST_OPTIONAL_HPP
--- a/include/msgpack/adaptor/boost/string_ref.hpp
+++ b/include/msgpack/adaptor/boost/string_ref.hpp
@@ -1,15 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2016 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_BOOST_STRING_REF_HPP
-#define MSGPACK_TYPE_BOOST_STRING_REF_HPP
-
-#include "msgpack/v1/adaptor/boost/string_ref.hpp"
-
-#endif // MSGPACK_TYPE_BOOST_STRING_REF_HPP
--- a/include/msgpack/adaptor/boost/string_view.hpp
+++ b/include/msgpack/adaptor/boost/string_view.hpp
@@ -1,15 +0,0 @@
-//
-// 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_BOOST_STRING_VIEW_HPP
-#define MSGPACK_TYPE_BOOST_STRING_VIEW_HPP
-
-#include "msgpack/v1/adaptor/boost/string_view.hpp"
-
-#endif // MSGPACK_TYPE_BOOST_STRING_VIEW_HPP
--- a/include/msgpack/adaptor/carray.hpp
+++ b/include/msgpack/adaptor/carray.hpp
@@ -1,15 +0,0 @@
-//
-// MessagePack for C++ static resolution routine
-//
-// Copyright (C) 2016 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_CARRAY_HPP
-#define MSGPACK_TYPE_CARRAY_HPP
-
-#include "msgpack/v1/adaptor/carray.hpp"
-
-#endif // MSGPACK_TYPE_CARRAY_HPP
--- a/include/msgpack/adaptor/char_ptr.hpp
+++ b/include/msgpack/adaptor/char_ptr.hpp
@@ -1,15 +1,78 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2016 KONDO Takatoshi
+// Copyright (C) 2014-2015 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)
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
 //
 #ifndef MSGPACK_TYPE_CHAR_PTR_HPP
 #define MSGPACK_TYPE_CHAR_PTR_HPP

-#include "msgpack/v1/adaptor/char_ptr.hpp"
+#include "msgpack/versioning.hpp"
+#include "msgpack/object_fwd.hpp"
+#include "msgpack/adaptor/check_container_size.hpp"
+
+#include <cstring>
+
+namespace msgpack {
+
+MSGPACK_API_VERSION_NAMESPACE(v1) {
+
+template <typename Stream>
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const char* v)
+{
+    uint32_t size = checked_get_container_size(std::strlen(v));
+    o.pack_str(size);
+    o.pack_str_body(v, size);
+    return o;
+}
+
+inline void operator<< (msgpack::object::with_zone& o, const char* v)
+{
+    uint32_t size = checked_get_container_size(std::strlen(v));
+    o.type = msgpack::type::STR;
+    char* ptr = static_cast<char*>(o.zone.allocate_align(size));
+    o.via.str.ptr = ptr;
+    o.via.str.size = size;
+    std::memcpy(ptr, v, size);
+}
+
+inline void operator<< (msgpack::object& o, const char* v)
+{
+    uint32_t size = checked_get_container_size(std::strlen(v));
+    o.type = msgpack::type::STR;
+    o.via.str.ptr = v;
+    o.via.str.size = size;
+}
+
+template <typename Stream>
+inline packer<Stream>& operator<< (packer<Stream>& o, char* v)
+{
+    return msgpack::operator<<(o, static_cast<const char*>(v));
+}
+
+inline void operator<< (object::with_zone& o, char* v)
+{
+    msgpack::operator<<(o, static_cast<const char*>(v));
+}
+
+inline void operator<< (object& o, char* v)
+{
+    msgpack::operator<<(o, static_cast<const char*>(v));
+}
+
+}  // MSGPACK_API_VERSION_NAMESPACE(v1)
+
+}  // namespace msgpack

 #endif // MSGPACK_TYPE_CHAR_PTR_HPP
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`[false,true,null,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,127,127,255,65535,4294967295,-32,-32,-128,-32768,-2147483648,0.0,-0.0,1.0,-1.0,"a","a","a","","","",[0],[0],[0],[],[],[],{},{},{},{"a":97},{"a":97},{"a":97},[[]],[["a"]]]`