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

Unified Diff: src/IceCompileServer.cpp

Issue 1960393002: Subzero: Add necessary PNaCl files for standalone build. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero@master
Patch Set: make format Created 4 years, 7 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 | « src/IceBitVector.h ('k') | src/IceCompiler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/IceCompileServer.cpp
diff --git a/src/IceCompileServer.cpp b/src/IceCompileServer.cpp
index 15a86c3c0444957902434c3d4231f7e29048f48e..adb41025dfb1f3d646fae2b5b95f3a58f00d7826 100644
--- a/src/IceCompileServer.cpp
+++ b/src/IceCompileServer.cpp
@@ -24,7 +24,9 @@
#pragma clang diagnostic ignored "-Wunused-parameter"
#endif // __clang__
+#ifdef PNACL_LLVM
#include "llvm/Bitcode/NaCl/NaClBitcodeMungeUtils.h"
+#endif // PNACL_LLVM
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/raw_os_ostream.h"
#include "llvm/Support/Signals.h"
@@ -52,11 +54,10 @@ public:
~TextDataStreamer() final = default;
#ifdef PNACL_LLVM
using CreateType = TextDataStreamer *;
-#else // !PNACL_LLVM
+#else // !PNACL_LLVM
using CreateType = std::unique_ptr<TextDataStreamer>;
#endif // !PNACL_LLVM
- static CreateType create(const std::string &Filename,
- std::string *Err);
+ static CreateType create(const std::string &Filename, std::string *Err);
size_t GetBytes(unsigned char *Buf, size_t Len) final;
private:
@@ -64,8 +65,8 @@ private:
size_t Cursor = 0;
};
-TextDataStreamer::CreateType TextDataStreamer::create(const std::string &Filename,
- std::string *Err) {
+TextDataStreamer::CreateType
+TextDataStreamer::create(const std::string &Filename, std::string *Err) {
#ifdef PNACL_LLVM
TextDataStreamer *Streamer = new TextDataStreamer();
llvm::raw_string_ostream ErrStrm(*Err);
@@ -78,7 +79,7 @@ TextDataStreamer::CreateType TextDataStreamer::create(const std::string &Filenam
}
ErrStrm.flush();
return Streamer;
-#else // !PNACL_LLVM
+#else // !PNACL_LLVM
return CreateType();
#endif // !PNACL_LLVM
}
« no previous file with comments | « src/IceBitVector.h ('k') | src/IceCompiler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698