Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Unified Diff: tools/pnacl-llc/ThreadedStreamingCache.h

Issue 180483005: Fix PNaCl-local files after merging LLVM 3.4 (Closed) Base URL: http://git.chromium.org/native_client/pnacl-llvm.git@hs-merge-before-fixes
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/pnacl-freeze/pnacl-freeze.cpp ('k') | tools/pnacl-llc/ThreadedStreamingCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/pnacl-llc/ThreadedStreamingCache.h
diff --git a/tools/pnacl-llc/ThreadedStreamingCache.h b/tools/pnacl-llc/ThreadedStreamingCache.h
index b9fca129c677c76c48a80dc8f84560f3c7043243..7f1e71fe0ae4c69a02b03ae231d79d0b24f9a67f 100644
--- a/tools/pnacl-llc/ThreadedStreamingCache.h
+++ b/tools/pnacl-llc/ThreadedStreamingCache.h
@@ -29,8 +29,7 @@ class ThreadedStreamingCache : public llvm::StreamableMemoryObject {
virtual int readByte(uint64_t address, uint8_t* ptr) const LLVM_OVERRIDE;
virtual int readBytes(uint64_t address,
uint64_t size,
- uint8_t* buf,
- uint64_t* copied) const LLVM_OVERRIDE;
+ uint8_t* buf) const LLVM_OVERRIDE;
virtual const uint8_t *getPointer(uint64_t address,
uint64_t size) const LLVM_OVERRIDE {
// This could be fixed by ensuring the bytes are fetched and making a copy,
« no previous file with comments | « tools/pnacl-freeze/pnacl-freeze.cpp ('k') | tools/pnacl-llc/ThreadedStreamingCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698