2 files changed, 5 insertions, 11 deletions
diff --git a/include/clang/Lex/Lexer.h b/include/clang/Lex/Lexer.h
index fc65b1f..0f36df4 100644
--- a/include/clang/Lex/Lexer.h
+++ b/include/clang/Lex/Lexer.h
@@ -255,8 +255,8 @@ public:
   // string processing, because we know we need to read until we find the
   // closing '"' character.
   //
-  // The second interface is the combination of PeekCharAndSize with
-  // ConsumeChar.  PeekCharAndSize reads a phase 1/2 translated character,
+  // The second interface is the combination of getCharAndSize with
+  // ConsumeChar.  getCharAndSize reads a phase 1/2 translated character,
   // returning it and its size.  If the lexer decides that this character is
   // part of the current token, it calls ConsumeChar on it.  This two stage
   // approach allows us to emit diagnostics for characters (e.g. warnings about
@@ -287,7 +287,7 @@ public:
   }
 
 private:
-  /// ConsumeChar - When a character (identified by PeekCharAndSize) is consumed
+  /// ConsumeChar - When a character (identified by getCharAndSize) is consumed
   /// and added to a given token, check to see if there are diagnostics that
   /// need to be emitted or flags that need to be set on the token.  If so, do
   /// it.
diff --git a/include/clang/Lex/LiteralSupport.h b/include/clang/Lex/LiteralSupport.h
index c4ab5ae..2334d72 100644
--- a/include/clang/Lex/LiteralSupport.h
+++ b/include/clang/Lex/LiteralSupport.h
@@ -16,15 +16,10 @@
 #define CLANG_LITERALSUPPORT_H
 
 #include <string>
+#include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/System/DataTypes.h"
 
-namespace llvm {
-  class APInt;
-  class APFloat;
-  struct fltSemantics;
-}
-
 namespace clang {
 
 class Diagnostic;
@@ -82,8 +77,7 @@ public:
   /// The optional bool isExact (passed-by-reference) has its value
   /// set to true if the returned APFloat can represent the number in the
   /// literal exactly, and false otherwise.
-  llvm::APFloat GetFloatValue(const llvm::fltSemantics &Format,
-                              bool* isExact = NULL);
+  llvm::APFloat::opStatus GetFloatValue(llvm::APFloat &Result);
 
 private: