Move suport for redefining operator keywords from -fms-extensions to -fms-compatibility.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151776 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp
index 8988e48af559e69245895c80b97d7b44459ff88d..0364e4279a559050dd20c0b4728b6b0233108790 100644 (file)
--- a/lib/Lex/PPDirectives.cpp
+++ b/lib/Lex/PPDirectives.cpp
@@ -124,7 +124,7 @@ void Preprocessor::ReadMacroName(Token &MacroNameTok, char isDefineUndef) {
     const IdentifierInfo &Info = Identifiers.get(Spelling);
 
     // Allow #defining |and| and friends in microsoft mode.
-    if (Info.isCPlusPlusOperatorKeyword() && getLangOptions().MicrosoftExt) {
+    if (Info.isCPlusPlusOperatorKeyword() && getLangOptions().MicrosoftMode) {
       MacroNameTok.setIdentifierInfo(getIdentifierInfo(Spelling));
       return;
     }

diff --git a/test/Preprocessor/cxx_oper_keyword_ms_ext.cpp b/test/Preprocessor/cxx_oper_keyword_ms_compat.cpp
similarity index 97%
rename from test/Preprocessor/cxx_oper_keyword_ms_ext.cpp
rename to test/Preprocessor/cxx_oper_keyword_ms_compat.cpp
index 99caa2c4a3a23a62ce65a2ce96f45027c707770c..1c6ef90c8b8861b800e5f9c9a0886d43ab08c970 100644 (file)
--- a/test/Preprocessor/cxx_oper_keyword_ms_ext.cpp
+++ b/test/Preprocessor/cxx_oper_keyword_ms_compat.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -E -fms-extensions
+// RUN: %clang_cc1 %s -E -fms-compatibility
 
 bool f() {
   // Check that operators still work before redefining them.