Fixing various compiler warnings and applying minor tweaks to allow running of

the mojority of breakpad unittests in Google.

http://breakpad.appspot.com/399002/



git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@978 4c0a9323-5329-0410-9bdc-e9ce6186880e

2 files changed, 68 insertions, 62 deletions

diff --git a/src/processor/synth_minidump_unittest.cc b/src/processor/synth_minidump_unittest.cc
index 3b905f4b..4376933b 100644
--- a/src/processor/synth_minidump_unittest.cc
+++ b/src/processor/synth_minidump_unittest.cc
@@ -51,7 +51,6 @@ using google_breakpad::SynthMinidump::Section;
 using google_breakpad::SynthMinidump::Stream;
 using google_breakpad::SynthMinidump::String;
 using google_breakpad::SynthMinidump::SystemInfo;
-using google_breakpad::SynthMinidump::Thread;
 using google_breakpad::test_assembler::kBigEndian;
 using google_breakpad::test_assembler::kLittleEndian;
 using google_breakpad::test_assembler::Label;
@@ -168,11 +167,12 @@ TEST(Thread, Simple) {
   Memory stack(dump, 0xaad55a93cc3c0efcULL);
   stack.Append("stack contents");
   stack.Finish(0xe08cdbd1);
-  Thread thread(dump, 0x3d7ec360, stack, context,
-                0x3593f44d, // suspend count
-                0xab352b82, // priority class
-                0x2753d838, // priority
-                0xeb2de4be3f29e3e9ULL); // thread environment block
+  google_breakpad::SynthMinidump::Thread thread(
+      dump, 0x3d7ec360, stack, context,
+      0x3593f44d, // suspend count
+      0xab352b82, // priority class
+      0x2753d838, // priority
+      0xeb2de4be3f29e3e9ULL); // thread environment block
   string contents;
   ASSERT_TRUE(thread.GetContents(&contents));
   static const u_int8_t expected_bytes[] = {
diff --git a/src/processor/synth_minidump_unittest_data.h b/src/processor/synth_minidump_unittest_data.h
index 81995d21..be3bd701 100644
--- a/src/processor/synth_minidump_unittest_data.h
+++ b/src/processor/synth_minidump_unittest_data.h
@@ -247,22 +247,24 @@ static const MDRawContextARM arm_raw_context = {
   // context_flags
   0x591b9e6a,
   // iregs
-  0xa21594de,
-  0x820d8a25,
-  0xc4e133b2,
-  0x173a1c02,
-  0x105fb175,
-  0xe871793f,
-  0x5def70b3,
-  0xcee3a623,
-  0x7b3aa9b8,
-  0x52518537,
-  0x627012c5,
-  0x22723dcc,
-  0x16fcc971,
-  0x20988bcb,
-  0xf1ab806b,
-  0x99d5fc03,
+  {
+    0xa21594de,
+    0x820d8a25,
+    0xc4e133b2,
+    0x173a1c02,
+    0x105fb175,
+    0xe871793f,
+    0x5def70b3,
+    0xcee3a623,
+    0x7b3aa9b8,
+    0x52518537,
+    0x627012c5,
+    0x22723dcc,
+    0x16fcc971,
+    0x20988bcb,
+    0xf1ab806b,
+    0x99d5fc03,
+  },
   // cpsr
   0xb70df511,
   // float_save
@@ -270,47 +272,51 @@ static const MDRawContextARM arm_raw_context = {
     // fpscr
     0xa1e1f7ce1077e6b5ULL,
     // regs
-    0xbcb8d002eed7fbdeULL,
-    0x4dd26a43b96ae97fULL,
-    0x8eec22db8b31741cULL,
-    0xfd634bd7c5ad66a0ULL,
-    0x1681da0daeb3debeULL,
-    0x474a32bdf72d0b71ULL,
-    0xcaf464f8b1044834ULL,
-    0xcaa6592ae5c7582aULL,
-    0x4ee46889d877c3dbULL,
-    0xf8930cf301645cf5ULL,
-    0x4da7e9ebba27f7c7ULL,
-    0x69a7b02761944da3ULL,
-    0x2cda2b2e78195c06ULL,
-    0x66b227ab9b460a42ULL,
-    0x7e77e49e52ee0849ULL,
-    0xd62cd9663e76f255ULL,
-    0xe9370f082451514bULL,
-    0x50a1c674dd1b6029ULL,
-    0x405db4575829eac4ULL,
-    0x67b948764649eee7ULL,
-    0x93731885419229d4ULL,
-    0xdb0338bad72a4ce7ULL,
-    0xa0a451f996fca4c8ULL,
-    0xb4508ea668400a45ULL,
-    0xbff28c5c7a142423ULL,
-    0x4f31b42b96f3a431ULL,
-    0x2ce6789d4ea1ff37ULL,
-    0xfa150b52e4f82a3cULL,
-    0xe9ec40449e6ed4f3ULL,
-    0x5ceca87836fe2251ULL,
-    0x66f50de463ee238cULL,
-    0x42823efcd59ab511ULL,
+    {
+      0xbcb8d002eed7fbdeULL,
+      0x4dd26a43b96ae97fULL,
+      0x8eec22db8b31741cULL,
+      0xfd634bd7c5ad66a0ULL,
+      0x1681da0daeb3debeULL,
+      0x474a32bdf72d0b71ULL,
+      0xcaf464f8b1044834ULL,
+      0xcaa6592ae5c7582aULL,
+      0x4ee46889d877c3dbULL,
+      0xf8930cf301645cf5ULL,
+      0x4da7e9ebba27f7c7ULL,
+      0x69a7b02761944da3ULL,
+      0x2cda2b2e78195c06ULL,
+      0x66b227ab9b460a42ULL,
+      0x7e77e49e52ee0849ULL,
+      0xd62cd9663e76f255ULL,
+      0xe9370f082451514bULL,
+      0x50a1c674dd1b6029ULL,
+      0x405db4575829eac4ULL,
+      0x67b948764649eee7ULL,
+      0x93731885419229d4ULL,
+      0xdb0338bad72a4ce7ULL,
+      0xa0a451f996fca4c8ULL,
+      0xb4508ea668400a45ULL,
+      0xbff28c5c7a142423ULL,
+      0x4f31b42b96f3a431ULL,
+      0x2ce6789d4ea1ff37ULL,
+      0xfa150b52e4f82a3cULL,
+      0xe9ec40449e6ed4f3ULL,
+      0x5ceca87836fe2251ULL,
+      0x66f50de463ee238cULL,
+      0x42823efcd59ab511ULL,
+    },
     // extra
-    0xe9e14cd2,
-    0x865bb640,
-    0x9f3f0b3e,
-    0x94a71c52,
-    0x3c012f19,
-    0x6436637c,
-    0x46ccedcb,
-    0x7b341be7
+    {
+      0xe9e14cd2,
+      0x865bb640,
+      0x9f3f0b3e,
+      0x94a71c52,
+      0x3c012f19,
+      0x6436637c,
+      0x46ccedcb,
+      0x7b341be7,
+    }
   }
 };