Changeset 2122

Timestamp:

Dec 19, 2009, 3:30:55 PM (12 years ago)

Author:

Peter

Message:

Remove implementation of operator==(DataWeightProxy?, DataWeightProxy?)
and rather rely on implicit conversion to DataWeight? and its
operator. This implies the behavior changes but that change is needed
because the previous behavior was very unexpected.

closes #578

Location:

trunk

Files:

• test/data_weight_proxy_test.cc (modified) (2 diffs)
• yat/utility/DataWeightProxy.h (modified) (1 diff)

trunk/test/data_weight_proxy_test.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2008 Peter Johansson
+  Copyright (C) 2008, 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -76 +76 @@
     suite.add(false);
   }
+  if (holder() == holder())
+    suite.add(true);
+  else
+    suite.add(false);
   if (holder() != const_holder()) {
     suite.add(false);
   }
+  if (holder() == const_holder())
+    suite.add(true);
+  else
+    suite.add(false);
 
   suite.err() << "testing assignment\n";

trunk/yat/utility/DataWeightProxy.h

@@ -106 +106 @@
   };
 
-  
-  /**
-     \brief equality operator
-
-     \relates DataWeightProxy
-   */
-  template<typename DataIterator, typename WeightIterator>
-  bool operator==(const DataWeightProxy<DataIterator, WeightIterator>& lhs,
-                  const DataWeightProxy<DataIterator, WeightIterator>& rhs)
-  {
-    return lhs.data()==rhs.data() && lhs.weight()==rhs.weight();
-  }
-
 }}} // of namespace utility, yat, and theplu