wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1023449 - Try to check for MSVC before clang so that we live in the clang-cl world when building with that compiler; r=froydnj

Browse Source 
--HG--
extra : rebase_source : dbfcf19afa0aa030d4fc769f29ede4c957af669d
This commit is contained in:
Ehsan Akhgari 2014-06-10 16:33:39 -04:00
parent 583358c6fd
commit d721ae3699
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mfbt/Attributes.h
View File

@ -37,6 +37,7 @@
# define MOZ_ALWAYS_INLINE inline
#endif
#if defined(_MSC_VER)
/*
* g++ requires -std=c++0x or -std=gnu++0x to support C++11 functionality
* without warnings (functionality used by the macros below). These modes are
@ -44,8 +45,27 @@
* standardly, by checking whether __cplusplus has a C++11 or greater value.
* Current versions of g++ do not correctly set __cplusplus, so we check both
* for forward compatibility.
*
* Even though some versions of MSVC support explicit conversion operators, we
* don't indicate support for them here, due to
* http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
*/
#if defined(__clang__)
# if _MSC_VER >= 1800
# define MOZ_HAVE_CXX11_DELETE
# endif
# if _MSC_VER >= 1700
# define MOZ_HAVE_CXX11_FINAL final
# else
# if defined(__clang__)
# error Please do not try to use clang-cl with MSVC10 or below emulation!
# endif
/* MSVC <= 10 used to spell "final" as "sealed". */
# define MOZ_HAVE_CXX11_FINAL sealed
# endif
# define MOZ_HAVE_CXX11_OVERRIDE
# define MOZ_HAVE_NEVER_INLINE __declspec(noinline)
# define MOZ_HAVE_NORETURN __declspec(noreturn)
#elif defined(__clang__)
/*
* Per Clang documentation, "Note that marketing version numbers should not
* be used to check for language features, as different vendors use different
@ -94,21 +114,6 @@
# endif
# define MOZ_HAVE_NEVER_INLINE __attribute__((noinline))
# define MOZ_HAVE_NORETURN __attribute__((noreturn))
#elif defined(_MSC_VER)
# if _MSC_VER >= 1800
# define MOZ_HAVE_CXX11_DELETE
# endif
# if _MSC_VER >= 1700
# define MOZ_HAVE_CXX11_FINAL final
# else
/* MSVC <= 10 used to spell "final" as "sealed". */
# define MOZ_HAVE_CXX11_FINAL sealed
# endif
# define MOZ_HAVE_CXX11_OVERRIDE
# define MOZ_HAVE_NEVER_INLINE __declspec(noinline)
# define MOZ_HAVE_NORETURN __declspec(noreturn)
// Staying away from explicit conversion operators in MSVC for now, see
// http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
#endif
/*