Skip to content

Feature vs2015 support #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 15, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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&&
Expand Down
9 changes: 5 additions & 4 deletions include/msgpack/cpp_config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down