1 files changed, 10 insertions, 27 deletions

diff --git a/cc/base/hash_pair_unittest.cc b/cc/base/hash_pair_unittest.cc
index 685e935..ad16761 100644
--- a/cc/base/hash_pair_unittest.cc
+++ b/cc/base/hash_pair_unittest.cc
@@ -22,46 +22,29 @@ class HashPairTest : public testing::Test {
 // Verify that a hash_map can be constructed for pairs of integers of various
 // sizes.
 TEST_F(HashPairTest, IntegerPairs) {
-  typedef std::pair<short, short> ShortShortPair;
-  typedef std::pair<short, int> ShortIntPair;
-  typedef std::pair<short, int32> ShortInt32Pair;
-  typedef std::pair<short, int64> ShortInt64Pair;
+  typedef std::pair<int16, int16> Int16Int16Pair;
+  typedef std::pair<int16, int32> Int16Int32Pair;
+  typedef std::pair<int16, int64> Int16Int64Pair;
 
-  INSERT_PAIR_TEST(ShortShortPair, 4, 6);
-  INSERT_PAIR_TEST(ShortIntPair, 7, (1 << 30) + 4342);
-  INSERT_PAIR_TEST(ShortInt32Pair, 9, (1 << 29) + 378128932);
-  INSERT_PAIR_TEST(ShortInt64Pair, 10,
+  INSERT_PAIR_TEST(Int16Int16Pair, 4, 6);
+  INSERT_PAIR_TEST(Int16Int32Pair, 9, (1 << 29) + 378128932);
+  INSERT_PAIR_TEST(Int16Int64Pair, 10,
                    (GG_INT64_C(1) << 60) + GG_INT64_C(78931732321));
 
-  typedef std::pair<int, short> IntShortPair;
-  typedef std::pair<int, int> IntIntPair;
-  typedef std::pair<int, int32> IntInt32Pair;
-  typedef std::pair<int, int64> IntInt64Pair;
-
-  INSERT_PAIR_TEST(IntShortPair, 4, 6);
-  INSERT_PAIR_TEST(IntIntPair, 7, (1 << 30) + 4342);
-  INSERT_PAIR_TEST(IntInt32Pair, 9, (1 << 29) + 378128932);
-  INSERT_PAIR_TEST(IntInt64Pair, 10,
-                   (GG_INT64_C(1) << 60) + GG_INT64_C(78931732321));
-
-  typedef std::pair<int32, short> Int32ShortPair;
-  typedef std::pair<int32, int> Int32IntPair;
+  typedef std::pair<int32, int16> Int32Int16Pair;
   typedef std::pair<int32, int32> Int32Int32Pair;
   typedef std::pair<int32, int64> Int32Int64Pair;
 
-  INSERT_PAIR_TEST(Int32ShortPair, 4, 6);
-  INSERT_PAIR_TEST(Int32IntPair, 7, (1 << 30) + 4342);
+  INSERT_PAIR_TEST(Int32Int16Pair, 4, 6);
   INSERT_PAIR_TEST(Int32Int32Pair, 9, (1 << 29) + 378128932);
   INSERT_PAIR_TEST(Int32Int64Pair, 10,
                    (GG_INT64_C(1) << 60) + GG_INT64_C(78931732321));
 
-  typedef std::pair<int64, short> Int64ShortPair;
-  typedef std::pair<int64, int> Int64IntPair;
+  typedef std::pair<int64, int16> Int64Int16Pair;
   typedef std::pair<int64, int32> Int64Int32Pair;
   typedef std::pair<int64, int64> Int64Int64Pair;
 
-  INSERT_PAIR_TEST(Int64ShortPair, 4, 6);
-  INSERT_PAIR_TEST(Int64IntPair, 7, (1 << 30) + 4342);
+  INSERT_PAIR_TEST(Int64Int16Pair, 4, 6);
   INSERT_PAIR_TEST(Int64Int32Pair, 9, (1 << 29) + 378128932);
   INSERT_PAIR_TEST(Int64Int64Pair, 10,
                    (GG_INT64_C(1) << 60) + GG_INT64_C(78931732321));