From f789635ddcfbcffc6653bc7c3ff97a0e6354153d Mon Sep 17 00:00:00 2001 From: Ramki Ananthakrishnan Date: Thu, 29 Mar 2018 15:09:19 -0700 Subject: [PATCH 1/7] Fixed Coverity error due to missing header. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 77316769..bf2d4b87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export LD_LIBRARY_PATH="${BASE}/usr/lib:$LD_LIBRARY_PATH"; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi - if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi + - if [ "$CXX" = "g++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then cd /usr/include/c++/$(g++ -v 2>&1 | grep version | awk '{print $3}')/bits; ln -s ../ext/atomicity.h .; cd ${BASE}/usr; fi #gtest - wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip - unzip -q googletest-release-1.7.0.zip From b1620f1f6a1360db635d1fb60847e3869dabe732 Mon Sep 17 00:00:00 2001 From: Ananthakrishnan Date: Fri, 30 Mar 2018 15:14:59 -0700 Subject: [PATCH 2/7] Fixed Travis Mac OS build. --- include/msgpack/v1/unpack.hpp | 7 +++++-- include/msgpack/v1/unpack_decl.hpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/msgpack/v1/unpack.hpp b/include/msgpack/v1/unpack.hpp index 6405b1a4..bd0ebd2c 100644 --- a/include/msgpack/v1/unpack.hpp +++ b/include/msgpack/v1/unpack.hpp @@ -22,9 +22,12 @@ #include #if !defined(MSGPACK_USE_CPP03) +#if defined(__APPLE__) +#include +#else #include -#endif - +#endif // __APPLE__ +#endif // MSGPACK_USE_CPP03 #if defined(_MSC_VER) // avoiding confliction std::max, std::min, and macro in windows.h diff --git a/include/msgpack/v1/unpack_decl.hpp b/include/msgpack/v1/unpack_decl.hpp index 99896fa4..daca6205 100644 --- a/include/msgpack/v1/unpack_decl.hpp +++ b/include/msgpack/v1/unpack_decl.hpp @@ -22,9 +22,12 @@ #include #if !defined(MSGPACK_USE_CPP03) +#if defined(__APPLE__) +#include +#else #include -#endif - +#endif // __APPLE__ +#endif // MSGPACK_USE_CPP03 #if defined(_MSC_VER) // avoiding confliction std::max, std::min, and macro in windows.h From 1fdfde5d5f0011208212dfe1de8b93cf401e2ea2 Mon Sep 17 00:00:00 2001 From: Ananthakrishnan Date: Fri, 30 Mar 2018 15:30:49 -0700 Subject: [PATCH 3/7] Fixed #elif syntax. --- include/msgpack/v1/unpack.hpp | 2 +- include/msgpack/v1/unpack_decl.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msgpack/v1/unpack.hpp b/include/msgpack/v1/unpack.hpp index bd0ebd2c..6d9922bf 100644 --- a/include/msgpack/v1/unpack.hpp +++ b/include/msgpack/v1/unpack.hpp @@ -24,7 +24,7 @@ #if !defined(MSGPACK_USE_CPP03) #if defined(__APPLE__) #include -#else +#elif #include #endif // __APPLE__ #endif // MSGPACK_USE_CPP03 diff --git a/include/msgpack/v1/unpack_decl.hpp b/include/msgpack/v1/unpack_decl.hpp index daca6205..bf00820b 100644 --- a/include/msgpack/v1/unpack_decl.hpp +++ b/include/msgpack/v1/unpack_decl.hpp @@ -24,7 +24,7 @@ #if !defined(MSGPACK_USE_CPP03) #if defined(__APPLE__) #include -#else +#elif #include #endif // __APPLE__ #endif // MSGPACK_USE_CPP03 From bec47a59f0e4c6dcc27927dbd9182ea2b2f9b648 Mon Sep 17 00:00:00 2001 From: Ramki A Date: Mon, 2 Apr 2018 17:56:57 -0700 Subject: [PATCH 4/7] Update unpack.hpp --- include/msgpack/v1/unpack.hpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/msgpack/v1/unpack.hpp b/include/msgpack/v1/unpack.hpp index 6d9922bf..55f12afb 100644 --- a/include/msgpack/v1/unpack.hpp +++ b/include/msgpack/v1/unpack.hpp @@ -22,12 +22,8 @@ #include #if !defined(MSGPACK_USE_CPP03) -#if defined(__APPLE__) -#include -#elif #include -#endif // __APPLE__ -#endif // MSGPACK_USE_CPP03 +#endif #if defined(_MSC_VER) // avoiding confliction std::max, std::min, and macro in windows.h From 7e66dc28f06d049cfbb11aaa39eebc00e431d5fe Mon Sep 17 00:00:00 2001 From: Ramki A Date: Mon, 2 Apr 2018 17:57:25 -0700 Subject: [PATCH 5/7] Update unpack_decl.hpp --- include/msgpack/v1/unpack_decl.hpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/msgpack/v1/unpack_decl.hpp b/include/msgpack/v1/unpack_decl.hpp index bf00820b..c63f2d7d 100644 --- a/include/msgpack/v1/unpack_decl.hpp +++ b/include/msgpack/v1/unpack_decl.hpp @@ -22,12 +22,8 @@ #include #if !defined(MSGPACK_USE_CPP03) -#if defined(__APPLE__) -#include -#elif #include -#endif // __APPLE__ -#endif // MSGPACK_USE_CPP03 +#endif #if defined(_MSC_VER) // avoiding confliction std::max, std::min, and macro in windows.h From 0d39c577d828ddb2c0544a5678dc58c9eebc329c Mon Sep 17 00:00:00 2001 From: Ramki A Date: Mon, 2 Apr 2018 17:57:52 -0700 Subject: [PATCH 6/7] Update unpack.hpp --- include/msgpack/v1/unpack.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msgpack/v1/unpack.hpp b/include/msgpack/v1/unpack.hpp index 55f12afb..6405b1a4 100644 --- a/include/msgpack/v1/unpack.hpp +++ b/include/msgpack/v1/unpack.hpp @@ -25,6 +25,7 @@ #include #endif + #if defined(_MSC_VER) // avoiding confliction std::max, std::min, and macro in windows.h #ifndef NOMINMAX From 1f5cb8636636d135a64c7619d434d0434ccbe353 Mon Sep 17 00:00:00 2001 From: Ramki A Date: Mon, 2 Apr 2018 17:58:04 -0700 Subject: [PATCH 7/7] Update unpack_decl.hpp --- include/msgpack/v1/unpack_decl.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msgpack/v1/unpack_decl.hpp b/include/msgpack/v1/unpack_decl.hpp index c63f2d7d..99896fa4 100644 --- a/include/msgpack/v1/unpack_decl.hpp +++ b/include/msgpack/v1/unpack_decl.hpp @@ -25,6 +25,7 @@ #include #endif + #if defined(_MSC_VER) // avoiding confliction std::max, std::min, and macro in windows.h #ifndef NOMINMAX