aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Lex/PPDirectives.cpp2
-rw-r--r--test/Preprocessor/cxx_oper_keyword_ms_compat.cpp (renamed from test/Preprocessor/cxx_oper_keyword_ms_ext.cpp)2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp
index 8988e48af5..0364e4279a 100644
--- 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
index 99caa2c4a3..1c6ef90c8b 100644
--- 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.