Merge branch 'jonitis-feature_vs2015_support'

Author: redboltz

CMakeLists.txt

@@ -37,7 +37,19 @@ IF (MSGPACK_CXX11)
    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.")
+      IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
+          MESSAGE ( FATAL_ERROR "MSVC doesn't support C++11.")
+      ENDIF ()
+   ENDIF ()
+ELSE ()
+   IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+      SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}")
+   ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+      SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}")
+   ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+      IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 18)
+          SET (CMAKE_CXX_FLAGS "-DMSGPACK_USE_CPP03 ${CMAKE_CXX_FLAGS}")
+      ENDIF ()
    ENDIF ()
 ENDIF ()
 
@@ -59,6 +71,9 @@ IF (MSGPACK_BOOST)
    SET (Boost_USE_MULTITHREADED      ON)
    SET (Boost_USE_STATIC_RUNTIME    OFF)
    FIND_PACKAGE (Boost COMPONENTS chrono timer system)
+   INCLUDE_DIRECTORIES (
+       ${MSGPACK_BOOST_DIR}
+   )
 ENDIF ()
 
 FILE (GLOB_RECURSE PREDEF_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/predef/include/boost ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/predef/include/boost/*.h)

appveyor.yml

@@ -21,10 +21,20 @@ before_build:
 - cd ..
 - cd ..
 
+environment:
+  matrix:
+    - cpp11: -DMSGPACK_CXX11=ON
+      boost: -DMSGPACK_BOOST=ON
+    - cpp11: -DMSGPACK_CXX11=OFF
+      boost: -DMSGPACK_BOOST=ON
+    - cpp11: -DMSGPACK_CXX11=ON
+      boost: -DMSGPACK_BOOST=OFF
+    - cpp11: -DMSGPACK_CXX11=OFF
+      boost: -DMSGPACK_BOOST=OFF
 build_script:
 - md build
 - cd build
-- cmake -DMSGPACK_BOOST=ON -DMSGPACK_BOOST_DIR=C:\Libraries\boost -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8 ..
+- cmake %cpp11% %boost% -DMSGPACK_BOOST_DIR=C:\Libraries\\boost_1_58_0 -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\gtest-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8 ..
 - cmake --build . --config Release
 
 test_script:

example/cpp03/CMakeLists.txt

@@ -27,10 +27,6 @@ IF (MSGPACK_BOOST)
 ENDIF ()
 
 FOREACH (source_file ${exec_PROGRAMS})
-    INCLUDE_DIRECTORIES (
-        ../include
-        ${MSGPACK_BOOST_DIR}
-    )
     GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
     ADD_EXECUTABLE (
         ${source_file_we}
@@ -49,10 +45,6 @@ FOREACH (source_file ${exec_PROGRAMS})
 ENDFOREACH ()
 
 FOREACH (source_file ${with_pthread_PROGRAMS})
-    INCLUDE_DIRECTORIES (
-        ../include
-        ${MSGPACK_BOOST_DIR}
-    )
     GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
     ADD_EXECUTABLE (
         ${source_file_we}

include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp

@@ -71,11 +71,11 @@ namespace type {
 
         template< std::size_t I>
         typename tuple_element<I, base >::type&
-        get() { return std::get<I>(*this); }
+        get() & { return std::get<I>(*this); }
 
         template< std::size_t I>
         typename tuple_element<I, base >::type const&
-        get() const { return std::get<I>(*this); }
+        get() const& { return std::get<I>(*this); }
 
         template< std::size_t I>
         typename tuple_element<I, base >::type&&

include/msgpack/cpp_config.hpp

@@ -21,10 +21,11 @@
 #include "msgpack/versioning.hpp"
 
 #if !defined(MSGPACK_USE_CPP03)
-  // If MSVC would support C++11 completely,
-  // then 'defined(_MSC_VER)' would replace with
-  // '_MSC_VER < XXXX'
-# if (__cplusplus < 201103L) || defined(_MSC_VER)
+# if defined(_MSC_VER)
+#  if _MSC_VER < 1900
+#    define MSGPACK_USE_CPP03
+#  endif
+# elif (__cplusplus < 201103L)
 #  define MSGPACK_USE_CPP03
 # endif
 #endif // MSGPACK_USE_CPP03

include/msgpack/object.hpp

@@ -183,7 +183,7 @@ template <typename Stream>
 inline
 msgpack::packer<Stream>&
 msgpack::adaptor::pack<T, Enabler>::operator()(msgpack::packer<Stream>& o, T const& v) const {
-    return detail::packer_serializer<Stream, T>::pack(o, v);
+    return msgpack::detail::packer_serializer<Stream, T>::pack(o, v);
 }
 
 template <typename T, typename Enabler>

test/CMakeLists.txt

@@ -5,7 +5,6 @@ FIND_PACKAGE (Threads REQUIRED)
 INCLUDE_DIRECTORIES (
     ${GTEST_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIRS}
-    ${MSGPACK_BOOST_DIR}
 )
 
 LIST (APPEND check_PROGRAMS

test/boost_fusion.cpp

@@ -140,6 +140,11 @@ BOOST_FUSION_ADAPT_STRUCT(
     f3  // *3
     )
 
+#if !defined(_MSC_VER)
+
+// boost::fusion's adaptor uses std::tuple.
+// MSVC2015's std::tuple requires default constructor during 'as' process.
+// I don't know why...
 TEST(MSGPACK_BOOST, pack_convert_no_def_con)
 {
     std::stringstream ss;
@@ -151,6 +156,7 @@ TEST(MSGPACK_BOOST, pack_convert_no_def_con)
     EXPECT_TRUE(val1 == val2);
 }
 
+#endif // !defined(_MSC_VER)
 
 #endif // !defined(MSGPACK_USE_CPP03
 

test/msgpack_cpp11.cpp

@@ -456,6 +456,10 @@ TEST(MSGPACK_NO_DEF_CON_PAIR, simple_buffer)
     EXPECT_EQ(val1, val2);
 }
 
+#if !defined(_MSC_VER)
+
+// MSVC2015's std::tuple requires default constructor during 'as' process.
+// I don't know why...
 TEST(MSGPACK_NO_DEF_CON_TUPLE, simple_buffer)
 {
     std::tuple<no_def_con, no_def_con, no_def_con_composite> val1 {1, 2, 3};
@@ -480,6 +484,8 @@ TEST(MSGPACK_NO_DEF_CON_MSGPACK_TUPLE, simple_buffer)
     EXPECT_EQ(val1, val2);
 }
 
+#endif // !define(_MSC_VER)
+
 TEST(MSGPACK_NO_DEF_FORWARD_LIST, simple_buffer)
 {
     std::forward_list<no_def_con> val1 { 1, 2, 3 };