[cfe-commits] r125394 - in /cfe/trunk: include/clang/Lex/PreprocessingRecord.h include/clang/Serialization/ASTReader.h lib/Frontend/ASTUnit.cpp lib/Serialization/ASTReader.cpp

[Douglas Gregor]

Author: dgregor
Date: Fri Feb 11 13:46:30 2011
New Revision: 125394

URL: http://llvm.org/viewvc/llvm-project?rev=125394&view=rev
Log:
Rename the operation that loads a preprocessed entity from a given offset to indicate that we're loading from an offset, not an index, lest one be confused. No functionality change.

Modified:
    cfe/trunk/include/clang/Lex/PreprocessingRecord.h
    cfe/trunk/include/clang/Serialization/ASTReader.h
    cfe/trunk/lib/Frontend/ASTUnit.cpp
    cfe/trunk/lib/Serialization/ASTReader.cpp

Modified: cfe/trunk/include/clang/Lex/PreprocessingRecord.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/PreprocessingRecord.h?rev=125394&r1=125393&r2=125394&view=diff
==============================================================================
--- cfe/trunk/include/clang/Lex/PreprocessingRecord.h (original)
+++ cfe/trunk/include/clang/Lex/PreprocessingRecord.h Fri Feb 11 13:46:30 2011
@@ -250,7 +250,8 @@
     virtual void ReadPreprocessedEntities() = 0;
     
     /// \brief Read the preprocessed entity at the given offset.
-    virtual PreprocessedEntity *ReadPreprocessedEntity(uint64_t Offset) = 0;
+    virtual PreprocessedEntity *
+    ReadPreprocessedEntityAtOffset(uint64_t Offset) = 0;
   };
   
   /// \brief A record of the steps taken while preprocessing a source file,
@@ -297,7 +298,7 @@
     iterator end(bool OnlyLocalEntities = false);
     const_iterator begin(bool OnlyLocalEntities = false) const;
     const_iterator end(bool OnlyLocalEntities = false) const;
-    
+
     /// \brief Add a new preprocessed entity to this record.
     void addPreprocessedEntity(PreprocessedEntity *Entity);
     

Modified: cfe/trunk/include/clang/Serialization/ASTReader.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTReader.h?rev=125394&r1=125393&r2=125394&view=diff
==============================================================================
--- cfe/trunk/include/clang/Serialization/ASTReader.h (original)
+++ cfe/trunk/include/clang/Serialization/ASTReader.h Fri Feb 11 13:46:30 2011
@@ -898,7 +898,7 @@
   virtual void ReadPreprocessedEntities();
 
   /// \brief Read the preprocessed entity at the given offset.
-  virtual PreprocessedEntity *ReadPreprocessedEntity(uint64_t Offset);
+  virtual PreprocessedEntity *ReadPreprocessedEntityAtOffset(uint64_t Offset);
 
   /// \brief Read the header file information for the given file entry.
   virtual HeaderFileInfo GetHeaderFileInfo(const FileEntry *FE);

Modified: cfe/trunk/lib/Frontend/ASTUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ASTUnit.cpp?rev=125394&r1=125393&r2=125394&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/ASTUnit.cpp (original)
+++ cfe/trunk/lib/Frontend/ASTUnit.cpp Fri Feb 11 13:46:30 2011
@@ -1368,7 +1368,8 @@
 
   for (unsigned I = 0, N = PreprocessedEntitiesInPreamble.size(); I != N; ++I) {
     if (PreprocessedEntity *PE
-          = External->ReadPreprocessedEntity(PreprocessedEntitiesInPreamble[I]))
+          = External->ReadPreprocessedEntityAtOffset(
+                                            PreprocessedEntitiesInPreamble[I]))
       PreprocessedEntities.push_back(PE);
   }
   

Modified: cfe/trunk/lib/Serialization/ASTReader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=125394&r1=125393&r2=125394&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReader.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReader.cpp Fri Feb 11 13:46:30 2011
@@ -2787,7 +2787,7 @@
   }
 }
 
-PreprocessedEntity *ASTReader::ReadPreprocessedEntity(uint64_t Offset) {
+PreprocessedEntity *ASTReader::ReadPreprocessedEntityAtOffset(uint64_t Offset) {
   PerFileData *F = 0;  
   for (unsigned I = 0, N = Chain.size(); I != N; ++I) {
     if (Offset < Chain[I]->SizeInBits) {