diff options
| -rw-r--r-- | clang/include/clang/Basic/OnDiskHashTable.h | 5 | ||||
| -rw-r--r-- | clang/tools/clang-cc/CacheTokens.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/clang/include/clang/Basic/OnDiskHashTable.h b/clang/include/clang/Basic/OnDiskHashTable.h index 5008be16f17..f84b7f24a9a 100644 --- a/clang/include/clang/Basic/OnDiskHashTable.h +++ b/clang/include/clang/Basic/OnDiskHashTable.h @@ -73,7 +73,7 @@ inline void Emit64(llvm::raw_ostream& Out, uint64_t V) { Out << (unsigned char)(V >> 56); } -inline void Pad(llvm::raw_fd_ostream& Out, unsigned A) { +inline void Pad(llvm::raw_ostream& Out, unsigned A) { Offset off = (Offset) Out.tell(); uint32_t n = ((uintptr_t)(off+A-1) & ~(uintptr_t)(A-1)) - off; for (; n ; --n) @@ -184,7 +184,7 @@ public: insert(Buckets, NumBuckets, new (BA.Allocate<Item>()) Item(key, data)); } - io::Offset Emit(llvm::raw_fd_ostream& out) { + io::Offset Emit(llvm::raw_ostream& out) { using namespace clang::io; // Emit the payload of the table. @@ -193,7 +193,6 @@ public: if (!B.head) continue; // Store the offset for the data of this bucket. - // FIXME: need tell() to work on other raw ostreams B.off = out.tell(); // Write out the number of items in the bucket. diff --git a/clang/tools/clang-cc/CacheTokens.cpp b/clang/tools/clang-cc/CacheTokens.cpp index a886ba135a1..d9827dfaa38 100644 --- a/clang/tools/clang-cc/CacheTokens.cpp +++ b/clang/tools/clang-cc/CacheTokens.cpp @@ -604,7 +604,7 @@ public: return std::make_pair(n, sizeof(uint32_t)); } - static void EmitKey(llvm::raw_fd_ostream& Out, PTHIdKey* key, unsigned n) { + static void EmitKey(llvm::raw_ostream& Out, PTHIdKey* key, unsigned n) { // Record the location of the key data. This is used when generating // the mapping from persistent IDs to strings. key->FileOffset = Out.tell(); |
