This revision was automatically updated to reflect the committed changes. Closed by commit rL281766: [libc++] Fix inline attribute for non-MSVC Windows (authored by smeenai).
Changed prior to commit: https://reviews.llvm.org/D24678?vs=71680&id=71687#toc Repository: rL LLVM https://reviews.llvm.org/D24678 Files: libcxx/trunk/include/__config Index: libcxx/trunk/include/__config =================================================================== --- libcxx/trunk/include/__config +++ libcxx/trunk/include/__config @@ -560,9 +560,15 @@ #define _LIBCPP_TYPE_VIS_ONLY #define _LIBCPP_FUNC_VIS_ONLY #define _LIBCPP_ENUM_VIS -#define _LIBCPP_INLINE_VISIBILITY __forceinline -#define _LIBCPP_ALWAYS_INLINE __forceinline -#define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __forceinline +#if defined(_LIBCPP_MSVC) +# define _LIBCPP_INLINE_VISIBILITY __forceinline +# define _LIBCPP_ALWAYS_INLINE __forceinline +# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __forceinline +#else +# define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__always_inline__)) +# define _LIBCPP_ALWAYS_INLINE __attribute__ ((__always_inline__)) +# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __attribute__ ((__always_inline__)) +#endif #endif // _WIN32 #ifndef _LIBCPP_HIDDEN
Index: libcxx/trunk/include/__config =================================================================== --- libcxx/trunk/include/__config +++ libcxx/trunk/include/__config @@ -560,9 +560,15 @@ #define _LIBCPP_TYPE_VIS_ONLY #define _LIBCPP_FUNC_VIS_ONLY #define _LIBCPP_ENUM_VIS -#define _LIBCPP_INLINE_VISIBILITY __forceinline -#define _LIBCPP_ALWAYS_INLINE __forceinline -#define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __forceinline +#if defined(_LIBCPP_MSVC) +# define _LIBCPP_INLINE_VISIBILITY __forceinline +# define _LIBCPP_ALWAYS_INLINE __forceinline +# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __forceinline +#else +# define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__always_inline__)) +# define _LIBCPP_ALWAYS_INLINE __attribute__ ((__always_inline__)) +# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __attribute__ ((__always_inline__)) +#endif #endif // _WIN32 #ifndef _LIBCPP_HIDDEN
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
