[cfe-commits] r70158 - in /cfe/trunk: include/clang/Frontend/PCHReader.h lib/Frontend/PCHReader.cpp

[Chris Lattner]

Author: lattner
Date: Sun Apr 26 15:59:20 2009
New Revision: 70158

URL: http://llvm.org/viewvc/llvm-project?rev=70158&view=rev
Log:
Adjust to LLVM API changes that went into r70157.

Modified:
    cfe/trunk/include/clang/Frontend/PCHReader.h
    cfe/trunk/lib/Frontend/PCHReader.cpp

Modified: cfe/trunk/include/clang/Frontend/PCHReader.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/PCHReader.h?rev=70158&r1=70157&r2=70158&view=diff

==============================================================================
--- cfe/trunk/include/clang/Frontend/PCHReader.h (original)
+++ cfe/trunk/include/clang/Frontend/PCHReader.h Sun Apr 26 15:59:20 2009
@@ -86,7 +86,8 @@
   ASTConsumer *Consumer;
 
   /// \brief The bitstream reader from which we'll read the PCH file.
-  llvm::BitstreamReader Stream;
+  llvm::BitstreamReader StreamFile;
+  llvm::BitstreamCursor Stream;    
 
   /// \brief The file name of the PCH file.
   std::string FileName;
@@ -422,7 +423,7 @@
   Sema *getSema() { return SemaObj; }
 
   /// \brief Retrieve the stream that this PCH reader is reading from.
-  llvm::BitstreamReader &getStream() { return Stream; }
+  llvm::BitstreamCursor &getStream() { return Stream; }
 
   /// \brief Retrieve the identifier table associated with the
   /// preprocessor.

Modified: cfe/trunk/lib/Frontend/PCHReader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/PCHReader.cpp?rev=70158&r1=70157&r2=70158&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/PCHReader.cpp (original)
+++ cfe/trunk/lib/Frontend/PCHReader.cpp Sun Apr 26 15:59:20 2009
@@ -41,15 +41,15 @@
   /// \brief Helper class that saves the current stream position and
   /// then restores it when destroyed.
   struct VISIBILITY_HIDDEN SavedStreamPosition {
-    explicit SavedStreamPosition(llvm::BitstreamReader &Stream)
-      : Stream(Stream), Offset(Stream.GetCurrentBitNo()) { }
+    explicit SavedStreamPosition(llvm::BitstreamCursor &Cursor)
+      : Cursor(Cursor), Offset(Cursor.GetCurrentBitNo()) { }
 
     ~SavedStreamPosition() {
-      Stream.JumpToBit(Offset);
+      Cursor.JumpToBit(Offset);
     }
 
   private:
-    llvm::BitstreamReader &Stream;
+    llvm::BitstreamCursor &Cursor;
     uint64_t Offset;
   };
 }
@@ -1974,8 +1974,9 @@
   }
 
   // Initialize the stream
-  Stream.init((const unsigned char *)Buffer->getBufferStart(), 
-              (const unsigned char *)Buffer->getBufferEnd());
+  StreamFile.init((const unsigned char *)Buffer->getBufferStart(), 
+                  (const unsigned char *)Buffer->getBufferEnd());
+  Stream.init(StreamFile);
 
   // Sniff for the signature.
   if (Stream.Read(8) != 'C' ||