Google Git Google Git
Sign in
skia/external/github.com/abseil/abseil-cpp/refs/heads/test_1001311257^!/.
commit
d42a9b6d5ac2ebf8a89fc1ac6df989712e15d9c4
[log]
author
Abseil Team <absl-team@google.com>
Fri Oct 16 22:29:21 2026 -0700
committer
Copybara-Service <copybara-worker@google.com>
Fri Oct 16 22:31:06 2026 -0700
tree
fc9eb95396b112a6cec41c0077ba04550670494f
parent
843b28efde9cf54bd0312ff92a6f54d4a27e7137 [diff] 
Remove forced errors on misplaced ABSL_ATTRIBUTE_ALWAYS_INLINE and ABSL_ATTRIBUTE_NOINLINE attributes on MSVC

PiperOrigin-RevId: 1001311257

diff --git a/absl/base/attributes.h b/absl/base/attributes.h
index 601be76..bc080bc 100644
--- a/absl/base/attributes.h
+++ b/absl/base/attributes.h

@@ -115,11 +115,7 @@
 #elif defined(_MSC_VER) && \
     (_MSC_VER >= 1937 ||   \
      (_MSC_VER >= 1927 && ABSL_INTERNAL_CPLUSPLUS_LANG > 201703L))
-#define ABSL_ATTRIBUTE_ALWAYS_INLINE                                      \
-  _Pragma("warning(push)")                                                \
-      _Pragma("warning(error: 4649)") /* error on misplaced attributes */ \
-      [[msvc::forceinline]] /*                                         */ \
-      _Pragma("warning(pop)")
+#define ABSL_ATTRIBUTE_ALWAYS_INLINE [[msvc::forceinline]]
 #define ABSL_HAVE_ATTRIBUTE_ALWAYS_INLINE 1
 #else
 #define ABSL_ATTRIBUTE_ALWAYS_INLINE
@@ -131,11 +127,7 @@
 #elif defined(_MSC_VER) && \
     (_MSC_VER >= 1937 ||   \
      (_MSC_VER >= 1927 && ABSL_INTERNAL_CPLUSPLUS_LANG > 201703L))
-#define ABSL_ATTRIBUTE_NOINLINE                                           \
-  _Pragma("warning(push)")                                                \
-      _Pragma("warning(error: 4649)") /* error on misplaced attributes */ \
-      [[msvc::noinline]] /*                                            */ \
-      _Pragma("warning(pop)")
+#define ABSL_ATTRIBUTE_NOINLINE [[msvc::noinline]]
 #define ABSL_HAVE_ATTRIBUTE_NOINLINE 1
 #else
 #define ABSL_ATTRIBUTE_NOINLINE