check_type.cc: Minor tweaks.

2011-01-14  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/25_algorithms/is_permutation/check_type.cc: Minor
	tweaks.
	* testsuite/25_algorithms/is_permutation/1.cc: Cosmetic changes.

From-SVN: r168796

libstdc++-v3/ChangeLog

+2011-01-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* testsuite/25_algorithms/is_permutation/check_type.cc: Minor
+	tweaks.
+	* testsuite/25_algorithms/is_permutation/1.cc: Cosmetic changes.
+
 2011-01-13  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* testsuite/25_algorithms/is_permutation/check_type.cc: New.

libstdc++-v3/testsuite/25_algorithms/is_permutation/check_type.cc

@@ -29,20 +29,21 @@
 using __gnu_test::forward_iterator_wrapper;
 
 struct X { };
-
 bool operator==(const X&, const X) { return true; }
-bool predicate(const X&, const X&) { return true; }
+
+struct Y { };
+bool predicate(const Y&, const Y&) { return true; }
 
 bool
-test1(forward_iterator_wrapper<X>& lhs1, 
-      forward_iterator_wrapper<X>& rhs1)
+test1(forward_iterator_wrapper<X>& x1, 
+      forward_iterator_wrapper<X>& x2)
 {
-  return std::is_permutation(lhs1, lhs1, rhs1);
+  return std::is_permutation(x1, x1, x2);
 }
 
 bool
-test2(forward_iterator_wrapper<X>& x1,
-      forward_iterator_wrapper<X>& x2)
+test2(forward_iterator_wrapper<Y>& y1,
+      forward_iterator_wrapper<Y>& y2)
 {
-  return std::is_permutation(x1, x1, x2, predicate);
+  return std::is_permutation(y1, y1, y2, predicate);
 }