diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2013-05-04 16:56:22 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2013-05-04 16:56:22 +0000 |
| commit | f9734241b141ad9c19969bab9b56dd4246e35e7d (patch) | |
| tree | 079f1231cac302394a027ac262a4cf15c646a5df /include | |
| parent | aa3d68af3b533ee79a862f2c6d159b79d278a6fc (diff) | |
Reverting r181004 since it has broken test/Sema/wchar.c.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@181122 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/clang/AST/PrettyPrinter.h | 7 | ||||
| -rw-r--r-- | include/clang/Basic/TokenKinds.def | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/clang/AST/PrettyPrinter.h b/include/clang/AST/PrettyPrinter.h index 36e90724d9..e3c09e7b41 100644 --- a/include/clang/AST/PrettyPrinter.h +++ b/include/clang/AST/PrettyPrinter.h @@ -40,8 +40,7 @@ struct PrintingPolicy { SuppressUnwrittenScope(false), SuppressInitializers(false), ConstantArraySizeAsWritten(false), AnonymousTagLocations(true), SuppressStrongLifetime(false), Bool(LO.Bool), - TerseOutput(false), PolishForDeclaration(false), - MSWChar(LO.MicrosoftMode && !LO.WChar) { } + TerseOutput(false), PolishForDeclaration(false) { } /// \brief What language we're printing. LangOptions LangOpts; @@ -147,10 +146,6 @@ struct PrintingPolicy { /// declaration tag; such as, do not print attributes attached to the declaration. /// unsigned PolishForDeclaration : 1; - - /// \brief When true, print the built-in wchar_t type as __wchar_t. For use in - /// Microsoft mode when wchar_t is not available. - unsigned MSWChar : 1; }; } // end namespace clang diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def index 0dbff81d34..bcf0f31dcb 100644 --- a/include/clang/Basic/TokenKinds.def +++ b/include/clang/Basic/TokenKinds.def @@ -524,7 +524,6 @@ KEYWORD(__interface , KEYMS) ALIAS("__int8" , char , KEYMS) ALIAS("__int16" , short , KEYMS) ALIAS("__int32" , int , KEYMS) -ALIAS("__wchar_t" , wchar_t , KEYMS) ALIAS("_asm" , asm , KEYMS) ALIAS("_alignof" , __alignof , KEYMS) ALIAS("__builtin_alignof", __alignof , KEYMS) |