Merge pull request #952 from kovdan01/fix_name_conflicts

Fix name conflicts (C++)

Author: redboltz

.github/depends/boost.sh

@@ -33,9 +33,9 @@ while getopts "b:t:" c; do
   esac
 done
 
-wget https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
-tar xf boost_1_71_0.tar.bz2
-cd boost_1_71_0
+wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2
+tar xf boost_1_72_0.tar.bz2
+cd boost_1_72_0
 ./bootstrap.sh
 
 build()

.github/workflows/coverage.yml

@@ -26,7 +26,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: usr
-        key: ${{ runner.os }}-boost-20200401
+        key: ${{ runner.os }}-boost-20210508-1-72-0
     - name: Build boost
       if: steps.cache-boost.outputs.cache-hit != 'true'
       run: ./.github/depends/boost.sh -b both -t gcc

.github/workflows/gha.yml

@@ -23,7 +23,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: usr
-        key: ${{ runner.os }}-boost-20200107
+        key: ${{ runner.os }}-boost-20210508-1-72-0
     - name: Build boost
       if: steps.cache-boost.outputs.cache-hit != 'true'
       run: ./.github/depends/boost.sh -b 64 -t clang
@@ -102,7 +102,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: usr
-        key: ${{ runner.os }}-boost-20200107
+        key: ${{ runner.os }}-boost-20210508-1-72-0
     - name: Build boost
       if: steps.cache-boost.outputs.cache-hit != 'true'
       run: ./.github/depends/boost.sh -b both -t gcc
@@ -251,6 +251,7 @@ jobs:
         vcpkg update
         vcpkg install gtest:x64-windows
         vcpkg install zlib:x64-windows
+        vcpkg install boost:x64-windows
     - name: Build and test
       shell: powershell
       run: |

ci/build_regression.sh

@@ -22,7 +22,7 @@ then
     exit 1
 fi
 
-cmake -DMSGPACK_FUZZ_REGRESSION="ON" -DMSGPACK_CXX11="ON" -DMSGPACK_SAN=${MSGPACK_SAN} -v ..
+cmake -DMSGPACK_FUZZ_REGRESSION="ON" -DMSGPACK_CXX11="ON" -DMSGPACK_SAN=${MSGPACK_SAN} ..
 
 ret=$?
 if [ $ret -ne 0 ]

include/msgpack/v1/vrefbuffer.hpp

@@ -26,11 +26,16 @@
 
 #if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__)
 #include <sys/uio.h>
+namespace msgpack {
+typedef ::iovec iovec;
+} // namespace msgpack
 #else
+namespace msgpack {
 struct iovec {
     void  *iov_base;
     size_t iov_len;
 };
+} // namespace msgpack
 #endif
 
 namespace msgpack {
@@ -183,7 +188,7 @@ class vrefbuffer {
         }
     }
 
-    const struct iovec* vector() const
+    const iovec* vector() const
     {
         return m_array;
     }

test/buffer.cpp

@@ -42,7 +42,7 @@ TEST(buffer, vrefbuffer)
     vbuf.write("a", 1);
     vbuf.write("a", 1);
 
-    const struct iovec* vec = vbuf.vector();
+    const msgpack::iovec* vec = vbuf.vector();
     size_t veclen = vbuf.vector_size();
 
     msgpack::sbuffer sbuf;

test/msgpack_vref.cpp

@@ -34,8 +34,8 @@ using namespace std;
             test_type val1 = v[i];                                      \
             msgpack::pack(vbuf, val1);                                  \
             msgpack::sbuffer sbuf;                                      \
-            const struct iovec* cur = vbuf.vector();                    \
-            const struct iovec* end = cur + vbuf.vector_size();         \
+            const msgpack::iovec* cur = vbuf.vector();                  \
+            const msgpack::iovec* end = cur + vbuf.vector_size();       \
             for(; cur != end; ++cur)                                    \
                 sbuf.write((const char*)cur->iov_base, cur->iov_len);   \
             msgpack::object_handle oh;                                  \