Changeset 17:1b2e312c7b52 in rrlib_uri

Timestamp:

10.02.2021 21:23:51 (2 years ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

17.03

Children:

18:a5dd51c346e0, 19:49b39ac77cad

Phase:

public

Message:

Makes path iterator copy constructible (erroneously wasn't)

File:

• tPath.h (modified) (4 diffs)

tPath.h

@@ -305 +305 @@
 
     tConstIterator(const tPath& path, size_t element_index) :
-      path(path),
+      path(&path),
       element_index(element_index),
       element()
@@ -314 +314 @@
     friend bool operator==(const tConstIterator& lhs, const tConstIterator& rhs)
     {
-      return (&lhs.path == &rhs.path) && lhs.element_index == rhs.element_index;
+      return (*lhs.path == *rhs.path) && lhs.element_index == rhs.element_index;
     }
     friend bool operator!=(const tConstIterator& lhs, const tConstIterator& rhs)
@@ -350 +350 @@
     friend tConstIterator operator+(const tConstIterator& lhs, size_t rhs)
     {
-      return tConstIterator(lhs.path, lhs.element_index + rhs);
+      return tConstIterator(*lhs.path, lhs.element_index + rhs);
     }
     friend tConstIterator operator-(const tConstIterator& lhs, size_t rhs)
     {
-      return tConstIterator(lhs.path, lhs.element_index - rhs);
+      return tConstIterator(*lhs.path, lhs.element_index - rhs);
     }
 
   private:
 
-    const tPath& path;
+    const tPath* path;
     size_t element_index;
     tElement element;
@@ -365 +365 @@
     void UpdateElement()
     {
-      element = element_index >= path.element_count ? tStringRange() : path[element_index];
+      element = element_index >= path->element_count ? tStringRange() : (*path)[element_index];
     }
   };