forked from boostorg/intrusive
Merge branch 'MSOpenTech-winrt' into develop
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// (C) Copyright Ion Gaztanaga 2006-2013
|
// (C) Copyright Ion Gaztanaga 2006-2014
|
||||||
|
// (C) Copyright Microsoft Corporation 2014
|
||||||
//
|
//
|
||||||
// Distributed under the Boost Software License, Version 1.0.
|
// Distributed under the Boost Software License, Version 1.0.
|
||||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||||
@@ -150,7 +151,7 @@ struct identity
|
|||||||
#define BOOST_INTRUSIVE_TT_DECL
|
#define BOOST_INTRUSIVE_TT_DECL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_MSC_EXTENSIONS) && !defined(__BORLAND__) && !defined(_WIN64) && !defined(UNDER_CE)
|
#if defined(_MSC_EXTENSIONS) && !defined(__BORLAND__) && !defined(_WIN64) && !defined(_M_ARM) && !defined(UNDER_CE)
|
||||||
#define BOOST_INTRUSIVE_TT_TEST_MSC_FUNC_SIGS
|
#define BOOST_INTRUSIVE_TT_TEST_MSC_FUNC_SIGS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user