Merge branch 'gongminmin-develop' into develop

This commit is contained in:
Ion Gaztañaga
2017-06-08 14:17:33 +02:00

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