merge from develop

This commit is contained in:
Ion Gaztañaga
2017-06-26 00:56:17 +02:00
2 changed files with 3 additions and 2 deletions

View File

@@ -791,7 +791,8 @@ Many thanks to all boosters that have tested, reviewed and improved the library.
[section:release_notes_boost_1_65 Boost 1.65 Release] [section:release_notes_boost_1_65 Boost 1.65 Release]
* Fixed bug: * Fixed bug:
* [@https://github.com/boostorg/move/pull/11 Git Pull #11: ['"replace 'std::random_shuffle' by '::random_shuffle'"]], * [@https://github.com/boostorg/move/pull/11 Git Pull #11: ['"replace 'std::random_shuffle' by '::random_shuffle'"]].
* [@https://github.com/boostorg/move/pull/12 Git Pull #12: ['"Adds support for MSVC ARM64 target'"]].
[endsect] [endsect]

View File

@@ -446,7 +446,7 @@ class is_convertible
#define BOOST_MOVE_TT_DECL #define BOOST_MOVE_TT_DECL
#endif #endif
#if defined(_MSC_EXTENSIONS) && !defined(__BORLAND__) && !defined(_WIN64) && !defined(_M_ARM) && !defined(UNDER_CE) #if defined(_MSC_EXTENSIONS) && !defined(__BORLAND__) && !defined(_WIN64) && !defined(_M_ARM) && !defined(_M_ARM64) && !defined(UNDER_CE)
#define BOOST_MOVE_TT_TEST_MSC_FUNC_SIGS #define BOOST_MOVE_TT_TEST_MSC_FUNC_SIGS
#endif #endif