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

Unified Diff: src/platform/update_engine/subprocess.cc

Issue 1718001: AU: Class to perform delta updates. (Closed)
Patch Set: fixes for review Created 10 years, 8 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: src/platform/update_engine/subprocess.cc
diff --git a/src/platform/update_engine/subprocess.cc b/src/platform/update_engine/subprocess.cc
index 3a6597eb193bdfc6d0f761c674411d3180d1a431..87d82532a8886750c715b7cb4d4642e3f7fa5ff6 100644
--- a/src/platform/update_engine/subprocess.cc
+++ b/src/platform/update_engine/subprocess.cc
@@ -17,7 +17,7 @@ using std::vector;
namespace chromeos_update_engine {
void Subprocess::GChildExitedCallback(GPid pid, gint status, gpointer data) {
- COMPILE_ASSERT(sizeof(guint) == sizeof(uint32),
+ COMPILE_ASSERT(sizeof(guint) == sizeof(uint32_t),
guint_uint32_size_mismatch);
guint* tag = reinterpret_cast<guint*>(data);
const SubprocessCallbackRecord& record = Get().callback_records_[*tag];
@@ -37,7 +37,7 @@ void FreeArgv(char** argv) {
}
} // namespace {}
-uint32 Subprocess::Exec(const std::vector<std::string>& cmd,
+uint32_t Subprocess::Exec(const std::vector<std::string>& cmd,
ExecCallback callback,
void* p) {
GPid child_pid;
@@ -79,7 +79,7 @@ uint32 Subprocess::Exec(const std::vector<std::string>& cmd,
return *tag;
}
-void Subprocess::CancelExec(uint32 tag) {
+void Subprocess::CancelExec(uint32_t tag) {
if (callback_records_[tag].callback) {
callback_records_[tag].callback = NULL;
}

Powered by Google App Engine
This is Rietveld 408576698