lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h - Issue 180483005: Fix PNaCl-local files after merging LLVM 3.4

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: lib/Bitcode/NaCl/Reader/NaClBitcodeReader.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

Index: lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h

diff --git a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h

index 62ea1b78d225fdb6e7a2a3962ff62f1754c8c9d5..32e9f6e413c25ca3daea10bf31c9fbbe93977cb8 100644

--- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h

+++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h

@@ -225,8 +225,8 @@ public:

virtual bool isMaterializable(const GlobalValue *GV) const;

virtual bool isDematerializable(const GlobalValue *GV) const;

- virtual bool Materialize(GlobalValue *GV, std::string *ErrInfo = 0);

- virtual bool MaterializeModule(Module *M, std::string *ErrInfo = 0);

+ virtual error_code Materialize(GlobalValue *GV);

+ virtual error_code MaterializeModule(Module *M);

virtual void Dematerialize(GlobalValue *GV);

bool Error(const std::string &Str) {

« no previous file with comments | « lib/Bitcode/NaCl/Reader/NaClBitcodeHeader.cpp ('k') | lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp » ('j') | no next file with comments »