зеркало из https://github.com/microsoft/mso.git
__actasmsvc__ is an internal-only concept (#5)
This commit is contained in:
Родитель
ee250782df
Коммит
29b1dd9a9f
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
// Check if compiler supports UUID
|
// Check if compiler supports UUID
|
||||||
#ifndef COMPILER_SUPPORTS_UUID
|
#ifndef COMPILER_SUPPORTS_UUID
|
||||||
# if defined(__clang__) || defined(__actasmsvc__) || defined(__GNUC__)
|
# if defined(__clang__) || defined(__GNUC__)
|
||||||
# define COMPILER_SUPPORTS_UUID 0
|
# define COMPILER_SUPPORTS_UUID 0
|
||||||
# elif defined(_MSC_VER)
|
# elif defined(_MSC_VER)
|
||||||
# define COMPILER_SUPPORTS_UUID 1
|
# define COMPILER_SUPPORTS_UUID 1
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#ifndef LIBLET_COMPILERADAPTERS_COMPILERWARNINGS_IMPL_H
|
#ifndef LIBLET_COMPILERADAPTERS_COMPILERWARNINGS_IMPL_H
|
||||||
#define LIBLET_COMPILERADAPTERS_COMPILERWARNINGS_IMPL_H
|
#define LIBLET_COMPILERADAPTERS_COMPILERWARNINGS_IMPL_H
|
||||||
|
|
||||||
#if defined(__clang__) || defined(__actasmsvc__)
|
#if defined(__clang__)
|
||||||
|
|
||||||
#define COMPILER_WARNING_PUSH() __pragma(clang diagnostic push)
|
#define COMPILER_WARNING_PUSH() __pragma(clang diagnostic push)
|
||||||
#define COMPILER_WARNING_DISABLE_ALL(msvcNum, clangWarn) COMPILER_WARNING_DISABLE_CLANG(clangWarn)
|
#define COMPILER_WARNING_DISABLE_ALL(msvcNum, clangWarn) COMPILER_WARNING_DISABLE_CLANG(clangWarn)
|
||||||
|
|
|
@ -14,16 +14,16 @@
|
||||||
The pragmas below allow explicitly indicate that code is unmanaged, but these
|
The pragmas below allow explicitly indicate that code is unmanaged, but these
|
||||||
pragmas are not recognized by Clang compiler.
|
pragmas are not recognized by Clang compiler.
|
||||||
*/
|
*/
|
||||||
#if !defined(__clang__) && !defined(__actasmsvc__)
|
#if !defined(__clang__)
|
||||||
|
|
||||||
#define MSO_PRAGMA_MANAGED_PUSH_OFF __pragma(managed(push, off))
|
#define MSO_PRAGMA_MANAGED_PUSH_OFF __pragma(managed(push, off))
|
||||||
#define MSO_PRAGMA_MANAGED_POP __pragma(managed(pop))
|
#define MSO_PRAGMA_MANAGED_POP __pragma(managed(pop))
|
||||||
|
|
||||||
#else // !defined(__clang__) && !defined(__actasmsvc__)
|
#else // !defined(__clang__)
|
||||||
|
|
||||||
#define MSO_PRAGMA_MANAGED_PUSH_OFF
|
#define MSO_PRAGMA_MANAGED_PUSH_OFF
|
||||||
#define MSO_PRAGMA_MANAGED_POP
|
#define MSO_PRAGMA_MANAGED_POP
|
||||||
|
|
||||||
#endif // !defined(__clang__) && !defined(__actasmsvc__)
|
#endif // !defined(__clang__)
|
||||||
|
|
||||||
#endif // COMPILERADAPTERS_MANAGEDCPP_H
|
#endif // COMPILERADAPTERS_MANAGEDCPP_H
|
||||||
|
|
|
@ -59,7 +59,7 @@ __pragma(warning(suppress:4472)) enum class AssertResult : uint32_t
|
||||||
#endif // C++
|
#endif // C++
|
||||||
|
|
||||||
// TODO: move this abstraction into compilerAdapters? Except it depends on windows - hmm
|
// TODO: move this abstraction into compilerAdapters? Except it depends on windows - hmm
|
||||||
#if defined(__clang__) || defined(__actasmsvc__) || defined(__cplusplus_cli) || defined(__INTELLISENSE__)
|
#if defined(__clang__) || defined(__cplusplus_cli) || defined(__INTELLISENSE__)
|
||||||
#define AssertBreak(wzMsg) __debugbreak()
|
#define AssertBreak(wzMsg) __debugbreak()
|
||||||
#elif defined(_DBGRAISEASSERTIONFAILURE_)
|
#elif defined(_DBGRAISEASSERTIONFAILURE_)
|
||||||
#define AssertBreak(wzMsg) \
|
#define AssertBreak(wzMsg) \
|
||||||
|
|
Загрузка…
Ссылка в новой задаче