Changeset 4039

Timestamp:

Feb 11, 2021, 8:30:04 AM (3 years ago)

Author:

Peter

Message:

Using me::value_type propagated to compilation errors and created
rather cryptic messages. Prefer the clearer Segment<T, Compare>.

File:

• trunk/yat/utility/SegmentSet.h (modified) (5 diffs)

trunk/yat/utility/SegmentSet.h

@@ -63 +63 @@
      */
     typename me::const_iterator
-    insert_merge(const typename me::value_type& segment)
+    insert_merge(const Segment<T, Compare>& segment)
     {
       std::pair<typename me::iterator, typename me::iterator> p =
@@ -78 +78 @@
      */
     typename me::const_iterator
-    insert_merge(typename me::value_type&& segment)
+    insert_merge(Segment<T, Compare>&& segment)
     {
       std::pair<typename me::iterator, typename me::iterator> p =
@@ -96 +96 @@
      */
     typename me::iterator insert_merge(typename me::iterator hint,
-                                       const typename me::value_type& segment)
-    {
-      typename me::value_type tmp(segment);
+                                       const Segment<T, Compare>& segment)
+    {
+      Segment<T, Compare> tmp(segment);
       return insert_merge(hint, std::move(tmp));
     }
@@ -108 +108 @@
     typename me::iterator
     insert_merge(typename me::iterator hint,
-                 typename me::value_type&& segment)
+                 Segment<T, Compare>&& segment)
     {
       std::pair<typename me::iterator, typename me::iterator> p(hint, hint);
@@ -171 +171 @@
     move_insert_merge(const std::pair<typename me::iterator,
                                       typename me::iterator>& p,
-                      typename me::value_type&& segment)
+                      Segment<T, Compare>&& segment)
     {
       YAT_ASSERT(p.first==this->end() || !compare(*p.first, segment));