Merge pull request #246 from OpenVicProject/fix/self-friend-warning

Fix base_iterator_t friend of itself warning
OpenVicProject · Dec 14, 2024 · ea99f0c · ea99f0c
2 parents 21d0aff + 1e838c4
commit ea99f0c
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/openvic-simulation/types/IndexedMap.hpp b/src/openvic-simulation/types/IndexedMap.hpp
@@ -61,8 +61,6 @@ namespace OpenVic {
 
 		template<bool CONST>
 		struct base_iterator_t {
-			friend struct base_iterator_t;
-
 			using map_type = IndexedMap<Key, Value>;
 
 			using key_type = map_type::key_type;
@@ -169,37 +167,37 @@ namespace OpenVic {
 
 			template<bool OTHER_CONST>
 			difference_type operator-(base_iterator_t<OTHER_CONST> const& rhs) const {
-				return key_it - rhs.key_it;
+				return key_it - rhs.get_key_it();
 			}
 
 			template<bool OTHER_CONST>
 			bool operator==(base_iterator_t<OTHER_CONST> const& rhs) const {
-				return key_it == rhs.key_it;
+				return key_it == rhs.get_key_it();
 			}
 
 			template<bool OTHER_CONST>
 			bool operator!=(base_iterator_t<OTHER_CONST> const& rhs) const {
-				return key_it != rhs.key_it;
+				return key_it != rhs.get_key_it();
 			}
 
 			template<bool OTHER_CONST>
 			bool operator<(base_iterator_t<OTHER_CONST> const& rhs) const {
-				return key_it < rhs.key_it;
+				return key_it < rhs.get_key_it();
 			}
 
 			template<bool OTHER_CONST>
 			bool operator>(base_iterator_t<OTHER_CONST> const& rhs) const {
-				return key_it > rhs.key_it;
+				return key_it > rhs.get_key_it();
 			}
 
 			template<bool OTHER_CONST>
 			bool operator<=(base_iterator_t<OTHER_CONST> const& rhs) const {
-				return key_it <= rhs.key_it;
+				return key_it <= rhs.get_key_it();
 			}
 
 			template<bool OTHER_CONST>
 			bool operator>=(base_iterator_t<OTHER_CONST> const& rhs) const {
-				return key_it >= rhs.key_it;
+				return key_it >= rhs.get_key_it();
 			}
 		};