Merge pull request #988 from redboltz/cpp_4.0.3

Updated the version to 4.0.3.
2025-10-21 07:45:02 +02:00 · 2021-10-23 13:53:46 +09:00 · 2021-10-23 13:28:06 +09:00 · 2021-10-23 13:01:03 +09:00 · 2021-10-23 12:17:34 +09:00 · 2021-10-23 12:03:16 +09:00
9 changed files with 41 additions and 33 deletions
--- a/.github/workflows/gha.yml
+++ b/.github/workflows/gha.yml
@@ -210,7 +210,7 @@ jobs:
      run: |
        vcpkg update
        vcpkg install zlib:x64-windows
-        vcpkg install boost: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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 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)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ OPTION (MSGPACK_CXX20 "Using c++20 compiler" OFF)
 OPTION (MSGPACK_32BIT            "32bit compile"                        OFF)
 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)
@@ -153,28 +154,30 @@ IF (MSGPACK_BUILD_EXAMPLES)
 ENDIF ()

 # Doxygen
-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)
+IF (MSGPACK_BUILD_DOCS)
+    FIND_PACKAGE (Doxygen)
+    IF (DOXYGEN_FOUND)
        LIST (APPEND Doxyfile_cpp_CONTENT
-            COMMAND ${CMAKE_COMMAND} -E echo "HAVE_DOT       = YES" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_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 "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
        )
    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
-    )
 ENDIF ()

 # Install library.
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 `msgpack` for C++
 ===================

-Version 4.0.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)
+Version 4.0.3 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master)
 [![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master)

 It's like JSON but smaller and faster.
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 4.0.2.{build}
+version: 4.0.3.{build}

 branches:
  only:
--- a/include/msgpack/v3/adaptor/adaptor_base.hpp
+++ b/include/msgpack/v3/adaptor/adaptor_base.hpp
@@ -32,14 +32,15 @@ struct pack : v2::adaptor::pack<T, Enabler> {
 };

 template <typename T, typename Enabler>
-struct object<
-    T,
-    Enabler,
-    typename msgpack::enable_if<
-        !msgpack::is_same<T, std::string>::value &&
-        !msgpack::is_array<T>::value
-    >::type>
-    : v2::adaptor::object<T, Enabler> {
+struct object
+    : v2::adaptor::object<
+        T,
+        typename msgpack::enable_if<
+            !msgpack::is_same<T, std::string>::value &&
+            !msgpack::is_array<T>::value,
+            Enabler
+        >::type
+      > {
 };

 template <typename T, typename Enabler>
--- a/include/msgpack/v3/adaptor/adaptor_base_decl.hpp
+++ b/include/msgpack/v3/adaptor/adaptor_base_decl.hpp
@@ -30,7 +30,7 @@ struct convert;
 template <typename T, typename Enabler = void>
 struct pack;

-template <typename T, typename Enabler = void, typename Enabler2 = void>
+template <typename T, typename Enabler = void>
 struct object;

 template <typename T, typename Enabler = void>
--- a/include/msgpack/version_master.hpp
+++ b/include/msgpack/version_master.hpp
@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    4
 #define MSGPACK_VERSION_MINOR    0
-#define MSGPACK_VERSION_REVISION 2
+#define MSGPACK_VERSION_REVISION 3
--- a/test/msgpack_basic.cpp
+++ b/test/msgpack_basic.cpp
@@ -214,7 +214,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(simple_buffer, TypeParam, IntegerToFloatingPointTe
    if (numeric_limits<integer_type>::is_signed) v.push_back(static_cast<integer_type>(-1));
    else v.push_back(2);
    for (unsigned int i = 0; i < kLoop; i++) {
-        v.push_back(rand() % 0x7FFFFF);
+        v.push_back(static_cast<integer_type>(rand() % 0x7FFFFF));
    }
    for (unsigned int i = 0; i < v.size() ; i++) {
        msgpack::sbuffer sbuf;
Author	SHA1	Message	Date
Takatoshi Kondo	53bfbba863	Merge pull request #988 from redboltz/cpp_4.0.3 Updated the version to 4.0.3.	2021-10-23 13:53:46 +09:00
Takatoshi Kondo	63221f5524	Updated the version to 4.0.3.	2021-10-23 13:28:06 +09:00
Takatoshi Kondo	fb01067a05	Merge pull request #987 from redboltz/refine_enabler Removed Enabler2.	2021-10-23 13:01:03 +09:00
Takatoshi Kondo	af9ce1b627	Fixed test warning.	2021-10-23 12:17:34 +09:00
Takatoshi Kondo	9416c7cc5c	Removed Enabler2.	2021-10-23 12:03:16 +09:00
Takatoshi Kondo	241f001d17	Merge branch 'marascio-add-build-docs-option' into cpp_master	2021-09-23 11:07:08 +09:00
Takatoshi Kondo	e148b2b26d	Minimized boost install.	2021-09-23 10:45:53 +09:00
Louis R. Marascio	b4dcae20cc	Add option `MSGPACK_BUILD_DOCS`. This option explicitly controls the generation of targets related to Doxygen generation, rather than relying solely on whether Doxygen is discovered. It is enabled by default to preserve existing behavior, but if disabled then no Doxygen targets will be generated. This is useful when the library is included via CMake's `add_subdirectory()`.	2021-09-22 11:40:40 -05:00