From 70b94395d514ced1270fbb60fd9aaadd5ee10640 Mon Sep 17 00:00:00 2001
From: bolero-MURAKAMI <bolero.murakami@gmail.com>
Date: Thu, 7 Feb 2013 23:18:22 +0900
Subject: [PATCH] fix hash test

---
 libs/tuple/test/tuple.cpp     | 7 ++-----
 libs/variant/test/variant.cpp | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/libs/tuple/test/tuple.cpp b/libs/tuple/test/tuple.cpp
index 05569740..49b5feee 100644
--- a/libs/tuple/test/tuple.cpp
+++ b/libs/tuple/test/tuple.cpp
@@ -222,11 +222,8 @@ namespace testspr {
 			TESTSPR_BOTH_ASSERT(!sprout::tuples::is_tuple<int>::value);
 
 			// sprout::to_hash, sprout::hash
-			{
-				typedef sprout::tuples::tuple<int, int> type;
-				TESTSPR_BOTH_ASSERT(sprout::to_hash(type(1, 2)) == sprout::hash<type>()(type(1, 2)));
-				TESTSPR_BOTH_ASSERT(sprout::to_hash(type(1, 2)) != sprout::to_hash(type()));
-			}
+			TESTSPR_BOTH_ASSERT(sprout::to_hash(tup1) == sprout::hash<decltype(tup1)>()(tup1));
+			TESTSPR_BOTH_ASSERT(sprout::to_hash(tup1) != sprout::to_hash(sprout::tuples::tuple<int, double>()));
 		}
 	}
 }	// namespace testspr
diff --git a/libs/variant/test/variant.cpp b/libs/variant/test/variant.cpp
index 8e690ff2..3e7a102f 100644
--- a/libs/variant/test/variant.cpp
+++ b/libs/variant/test/variant.cpp
@@ -219,11 +219,8 @@ namespace testspr {
 			TESTSPR_BOTH_ASSERT(!sprout::is_variant<int>::value);
 
 			// sprout::to_hash, sprout::hash
-			{
-				typedef sprout::variant<int, char> type;
-				TESTSPR_BOTH_ASSERT(sprout::to_hash(type(1)) == sprout::hash<type>()(type(1)));
-				TESTSPR_BOTH_ASSERT(sprout::to_hash(type(1)) != sprout::to_hash(type()));
-			}
+			TESTSPR_BOTH_ASSERT(sprout::to_hash(var1) == sprout::hash<decltype(var1)>()(var1));
+			TESTSPR_BOTH_ASSERT(sprout::to_hash(var1) != sprout::to_hash(sprout::variant<int, double>()));
 		}
 	}
 }	// namespace testspr