Fix a bunch of issues blocking 64-bit orderfile generation.

tools/cygprofile/cygprofile_unittest.cc

Index: tools/cygprofile/cygprofile_unittest.cc
diff --git a/tools/cygprofile/cygprofile_unittest.cc b/tools/cygprofile/cygprofile_unittest.cc
index 7a1a3e29090cde50e4facac371aaba77dd03e0d9..5aa2efb834338f0f16af930005139dd669857bf0 100644
--- a/tools/cygprofile/cygprofile_unittest.cc
+++ b/tools/cygprofile/cygprofile_unittest.cc
@@ -46,12 +46,12 @@ TEST(CygprofileTest, ThreadLogBasic) {
   ASSERT_EQ(2U, entries.size());
   // The entries should appear in their insertion order.
   const LogEntry& first_entry = entries[0];
-  ASSERT_EQ(reinterpret_cast<int>(first_entry.address), 2);
+  ASSERT_EQ(reinterpret_cast<long>(first_entry.address), 2);

[Benoit L, 2015/02/04 17:12:57]

nit: uintptr_t is probably the most appropriate type here. It might not be
defined everywhere, but I believe that we are fine with our compilers.

[azarchs, 2015/02/04 17:49:54]

Done.

   ASSERT_EQ(getpid(), first_entry.pid);
   ASSERT_LT(0, first_entry.tid);
 
   const LogEntry& second_entry = entries[1];
-  ASSERT_EQ(1, reinterpret_cast<int>(second_entry.address));
+  ASSERT_EQ(1, reinterpret_cast<long>(second_entry.address));
   ASSERT_EQ(first_entry.pid, second_entry.pid);
   ASSERT_EQ(first_entry.tid, second_entry.tid);
 
@@ -87,8 +87,8 @@ TEST(CygprofileTest, ManagerBasic) {
 
   // The flush should have moved the data to the local vector of entries.
   EXPECT_EQ(2U, entries.size());
-  ASSERT_EQ(2, reinterpret_cast<int>(entries[0].address));
-  ASSERT_EQ(3, reinterpret_cast<int>(entries[1].address));
+  ASSERT_EQ(2, reinterpret_cast<long>(entries[0].address));
+  ASSERT_EQ(3, reinterpret_cast<long>(entries[1].address));
 }
 
 }  // namespace