Vendor import of clang release_32 branch r168974 (effectively, 3.2 RC2):

http://llvm.org/svn/llvm-project/cfe/branches/release_32@168974

1 files changed, 11 insertions, 7 deletions

diff --git a/include/clang/Frontend/LangStandard.h b/include/clang/Frontend/LangStandard.h
index e6f4403..f07cb02 100644
--- a/include/clang/Frontend/LangStandard.h
+++ b/include/clang/Frontend/LangStandard.h
@@ -18,16 +18,17 @@ namespace clang {
 namespace frontend {
 
 enum LangFeatures {
-  BCPLComment = (1 << 0),
+  LineComment = (1 << 0),
   C89 = (1 << 1),
   C99 = (1 << 2),
   C11 = (1 << 3),
   CPlusPlus = (1 << 4),
   CPlusPlus0x = (1 << 5),
-  Digraphs = (1 << 6),
-  GNUMode = (1 << 7),
-  HexFloat = (1 << 8),
-  ImplicitInt = (1 << 9)
+  CPlusPlus1y = (1 << 6),
+  Digraphs = (1 << 7),
+  GNUMode = (1 << 8),
+  HexFloat = (1 << 9),
+  ImplicitInt = (1 << 10)
 };
 
 }
@@ -53,8 +54,8 @@ public:
   /// getDescription - Get the description of this standard.
   const char *getDescription() const { return Description; }
 
-  /// hasBCPLComments - Language supports '//' comments.
-  bool hasBCPLComments() const { return Flags & frontend::BCPLComment; }
+  /// Language supports '//' comments.
+  bool hasLineComments() const { return Flags & frontend::LineComment; }
 
   /// isC89 - Language is a superset of C89.
   bool isC89() const { return Flags & frontend::C89; }
@@ -71,6 +72,9 @@ public:
   /// isCPlusPlus0x - Language is a C++0x variant.
   bool isCPlusPlus0x() const { return Flags & frontend::CPlusPlus0x; }
 
+  /// isCPlusPlus1y - Language is a C++1y variant.
+  bool isCPlusPlus1y() const { return Flags & frontend::CPlusPlus1y; }
+
   /// hasDigraphs - Language supports digraphs.
   bool hasDigraphs() const { return Flags & frontend::Digraphs; }