Merge branch 'winrt' of https://github.com/MSOpenTech/intrusive into MSOpenTech-winrt

This commit is contained in:
Ion Gaztañaga
2014-05-11 13:53:18 +02:00

View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2013 // (C) Copyright Ion Gaztanaga 2006-2013
// // Copyright (c) Microsoft Corporation
// 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
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
@@ -150,7 +150,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