[mathic] 19/62: changed Index to size_t in several places in tests, as on my gcc, tthe code did not compile

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository mathic.

commit 2dbdbfe05701e7269f5a4610a8a9c8698be0b192
Author: Mike Stillman <mikestillman1 at gmail.com>
Date:   Tue Jul 31 09:29:44 2012 -0400

    changed Index to size_t in several places in tests, as on my gcc, tthe code did not compile
---
 src/test/PairQueue.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/PairQueue.cpp b/src/test/PairQueue.cpp
index 17f0511..b8cfc5f 100755
--- a/src/test/PairQueue.cpp
+++ b/src/test/PairQueue.cpp
@@ -124,7 +124,7 @@ TEST(PairQueue, Ordering) {
   while (!pq.empty()) {
 	// Extract top pair and top pairdata and check that doing that in
 	// either order works.
-	std::pair<Index, Index> p;
+	std::pair<size_t, size_t> p;
 	std::string pd;
 	if ((pq.size() % 2) == 0) {
 	  pd = pq.topPairData();
@@ -140,11 +140,11 @@ TEST(PairQueue, Ordering) {
 	  Index const* begin = rows;
 	  Index const* end = rows + sizeof(rows) / sizeof(rows[0]);
 	  pq.addColumnDescending(begin, end);
-	  ASSERT_EQ((std::make_pair<Index, Index>(112, 0)), pq.topPair());
+	  ASSERT_EQ((std::make_pair<size_t, size_t>(112, 0)), pq.topPair());
 	  ASSERT_EQ("11209", pq.topPairData());
 	  pq.pop();
 	  ASSERT_EQ("1121119", pq.topPairData());
-	  ASSERT_EQ((std::make_pair<Index, Index>(112, 111)), pq.topPair());
+	  ASSERT_EQ((std::make_pair<size_t, size_t>(112, 111)), pq.topPair());
 	  pq.pop();
 	  // should be back at same place now
 	  ASSERT_EQ(pd, pq.topPairData());
@@ -189,13 +189,13 @@ TEST(PairQueue, LargeIndices) {
 	pq.addColumnDescending(rows, rows);
   ASSERT_EQ(100100, pq.columnCount());
   pq.addColumnDescending(rows, rows + sizeof(rows) / sizeof(rows[0]));
-  ASSERT_EQ((std::make_pair<Index, Index>(100100, 0)), pq.topPair());
+  ASSERT_EQ((std::make_pair<size_t, size_t>(100100, 0)), pq.topPair());
   ASSERT_EQ("10010007", pq.topPairData());
   pq.pop();
-  ASSERT_EQ((std::make_pair<Index, Index>(100100, 100000)), pq.topPair());
+  ASSERT_EQ((std::make_pair<size_t, size_t>(100100, 100000)), pq.topPair());
   ASSERT_EQ("1001001000007", pq.topPairData());
   pq.pop();
-  ASSERT_EQ((std::make_pair<Index, Index>(1, 0)), pq.topPair());
+  ASSERT_EQ((std::make_pair<size_t, size_t>(1, 0)), pq.topPair());
   ASSERT_EQ("107", pq.topPairData());
   pq.pop();
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathic.git