Changeset 1340 for trunk

Timestamp:

Jun 12, 2008, 8:51:53 PM (15 years ago)

Author:

Peter

Message:

fixing so declarations match implementations

File:

• trunk/yat/utility/Range.h (modified) (6 diffs)

trunk/yat/utility/Range.h

@@ -169 +169 @@
 
 
-  template<typename T>
-  bool operator==(const Range<T>& lhs, const Range<T>& rhs)
+  template<typename T1, typename T2>
+  bool operator==(const Range<T1>& lhs, const Range<T2>& rhs)
   {
     // we are not using std::equal because we want to handle ranges of
     // different length
-    T first1(lhs.begin());
-    T last1(lhs.end());
-    T first2(rhs.begin());
-    T last2(rhs.end());
+    T1 first1(lhs.begin());
+    T1 last1(lhs.end());
+    T2 first2(rhs.begin());
+    T2 last2(rhs.end());
     while (first1 != last1 && first2 != last2) {
       if (*first1 != *first2)
@@ -189 +189 @@
 
 
-  template<typename T>
-  bool operator!=(const Range<T>& lhs, const Range<T>& rhs)
+  template<typename T1, typename T2>
+  bool operator!=(const Range<T1>& lhs, const Range<T2>& rhs)
   { 
     return ! (lhs==rhs); 
@@ -196 +196 @@
 
 
-  template<typename T>
-  bool operator<(const Range<T>& lhs, const Range<T>& rhs)
+  template<typename T1, typename T2>
+  bool operator<(const Range<T1>& lhs, const Range<T2>& rhs)
   { 
     return std::lexicographical_compare(lhs.begin(), lhs.end(),
@@ -204 +204 @@
 
 
-  template<typename T>
-  bool operator>(const Range<T>& lhs, const Range<T>& rhs)
+  template<typename T1, typename T2>
+  bool operator>(const Range<T1>& lhs, const Range<T2>& rhs)
   { 
     return rhs < lhs; 
@@ -211 +211 @@
 
 
-  template<typename T>
-  bool operator<=(const Range<T>& lhs, const Range<T>& rhs)
+  template<typename T1, typename T2>
+  bool operator<=(const Range<T1>& lhs, const Range<T2>& rhs)
   { 
     return ! (rhs<lhs); 
@@ -218 +218 @@
 
 
-  template<typename T>
-  bool operator>=(const Range<T>& lhs, const Range<T>& rhs)
+  template<typename T1, typename T2>
+  bool operator>=(const Range<T1>& lhs, const Range<T2>& rhs)
   { 
     return ! (lhs<rhs);