commit f9cb98c0cacccca803db48502c7bd461d04cb6b0
author Ben Chan <benchan@chromium.org> Sun Sep 21 18:31:30 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Sep 22 10:00:24 2014 +0000
tree a1a66ed0251479c352e921c99e39ec763363714a
parent b8f16a18c39050839cac636588fd0b24f33093ed

update_engine: Clean up angle brackets in template types.

C++11 no longer has the angle bracket pitfall in template types.

BUG=None
TEST=`FEATURES=test emerge-$BOARD update_engine`

Change-Id: I0168b9f208ad8e62ae614b8a3b8bcf31c58fa9f2
Reviewed-on: https://chromium-review.googlesource.com/219203
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>

payload_generator/payload_signer.cc

diff --git a/payload_generator/payload_signer.cc b/payload_generator/payload_signer.cc
index 9a9008f..d3afb86 100644
--- a/payload_generator/payload_signer.cc
+++ b/payload_generator/payload_signer.cc
@@ -25,7 +25,7 @@
 
 // Given raw |signatures|, packs them into a protobuf and serializes it into a
 // binary blob. Returns true on success, false otherwise.
-bool ConvertSignatureToProtobufBlob(const vector<vector<char> >& signatures,
+bool ConvertSignatureToProtobufBlob(const vector<vector<char>>& signatures,
                                     vector<char>* out_signature_blob) {
   // Pack it into a protobuf
   Signatures out_message;
@@ -36,7 +36,7 @@
       << kSignatureMessageOriginalVersion << ", "
       << kSignatureMessageCurrentVersion << "] inclusive, but you only "
       << "provided " << signatures.size() << " signatures.";
-  for (vector<vector<char> >::const_iterator it = signatures.begin(),
+  for (vector<vector<char>>::const_iterator it = signatures.begin(),
            e = signatures.end(); it != e; ++it) {
     const vector<char>& signature = *it;
     Signatures_Signature* sig_message = out_message.add_signatures();
@@ -176,7 +176,7 @@
       unsigned_payload_path, -1, &hash_data) ==
                         utils::FileSize(unsigned_payload_path));
 
-  vector<vector<char> > signatures;
+  vector<vector<char>> signatures;
   for (vector<string>::const_iterator it = private_key_paths.begin(),
            e = private_key_paths.end(); it != e; ++it) {
     vector<char> signature;
@@ -215,7 +215,7 @@
   // TODO(petkov): Reduce memory usage -- the payload is manipulated in memory.
 
   // Loads the payload and adds the signature op to it.
-  vector<vector<char> > signatures;
+  vector<vector<char>> signatures;
   for (vector<int>::const_iterator it = signature_sizes.begin(),
            e = signature_sizes.end(); it != e; ++it) {
     vector<char> signature(*it, 0);
@@ -276,7 +276,7 @@
 
 bool PayloadSigner::AddSignatureToPayload(
     const string& payload_path,
-    const vector<vector<char> >& signatures,
+    const vector<vector<char>>& signatures,
     const string& signed_payload_path,
     uint64_t *out_metadata_size) {
   // TODO(petkov): Reduce memory usage -- the payload is manipulated in memory.