vendor/clang/clang-r108243

1 files changed, 7 insertions, 1 deletions

diff --git a/include/clang/Lex/Token.h b/include/clang/Lex/Token.h
index b5dde9a700e8..bd9b46869a35 100644
--- a/include/clang/Lex/Token.h
+++ b/include/clang/Lex/Token.h
@@ -148,6 +148,7 @@ public:
     Kind = tok::unknown;
     Flags = 0;
     PtrData = 0;
+    UintData = 0;
     Loc = SourceLocation();
   }
 
@@ -169,7 +170,7 @@ public:
   }
   void setLiteralData(const char *Ptr) {
     assert(isLiteral() && "Cannot set literal data of non-literal");
-    PtrData = (void*)Ptr;
+    PtrData = const_cast<char*>(Ptr);
   }
 
   void *getAnnotationValue() const {
@@ -254,4 +255,9 @@ struct PPConditionalInfo {
 
 }  // end namespace clang
 
+namespace llvm {
+  template <>
+  struct isPodLike<clang::Token> { static const bool value = true; };
+}  // end namespace llvm
+
 #endif