Skip to content

Commit b49befa

Browse files
committed
[clang] Rename deprecation-supressing macro
1 parent 42371d4 commit b49befa

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

clang/unittests/Basic/FileManagerTest.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@ TEST_F(FileManagerTest, getFileRefReturnsCorrectNameForDifferentStatPath) {
284284
ASSERT_FALSE(!F1Alias);
285285
ASSERT_FALSE(!F1Alias2);
286286
EXPECT_EQ("dir/f1.cpp", F1->getName());
287-
LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
287+
LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH
288288
EXPECT_EQ("dir/f1.cpp", F1->getFileEntry().getName());
289-
LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
289+
LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP
290290
EXPECT_EQ("dir/f1.cpp", F1Alias->getName());
291291
EXPECT_EQ("dir/f1.cpp", F1Alias2->getName());
292292
EXPECT_EQ(&F1->getFileEntry(), &F1Alias->getFileEntry());
@@ -305,9 +305,9 @@ TEST_F(FileManagerTest, getFileRefReturnsCorrectNameForDifferentStatPath) {
305305
ASSERT_FALSE(!F2Alias);
306306
ASSERT_FALSE(!F2Alias2);
307307
EXPECT_EQ("dir/f2.cpp", F2->getName());
308-
LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
308+
LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH
309309
EXPECT_EQ("dir/f2.cpp", F2->getFileEntry().getName());
310-
LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
310+
LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP
311311
EXPECT_EQ("dir/f2.cpp", F2Alias->getName());
312312
EXPECT_EQ("dir/f2.cpp", F2Alias2->getName());
313313
EXPECT_EQ(&F2->getFileEntry(), &F2Alias->getFileEntry());

llvm/include/llvm/Support/Compiler.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,20 +159,20 @@
159159

160160
// clang-format off
161161
#if defined(__clang__) || defined(__GNUC__)
162-
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN \
162+
#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH \
163163
_Pragma("GCC diagnostic push") \
164164
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
165-
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END \
165+
#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP \
166166
_Pragma("GCC diagnostic pop")
167167
#elif defined(_MSC_VER)
168-
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN \
168+
#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH \
169169
_Pragma("warning(push)") \
170170
_Pragma("warning(disable : 4996)")
171-
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END \
171+
#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP \
172172
_Pragma("warning(pop)")
173173
#else
174-
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
175-
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
174+
#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH
175+
#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP
176176
#endif
177177
// clang-format on
178178

0 commit comments

Comments
 (0)