Fix ambiguity in definition of iterator

Author: tturocy

src/games/game.h

@@ -877,7 +877,7 @@ class GameRep : public std::enable_shared_from_this<GameRep> {
     return Strategies(std::const_pointer_cast<GameRep>(this->shared_from_this()));
   }
   /// Gets the i'th strategy in the game, numbered globally starting from 1
-  GameStrategy GetStrategy(const int p_index) const
+  GameStrategy GetStrategy(const std::size_t p_index) const
   {
     const auto strategies = GetStrategies();
     if (p_index < 1 || p_index > strategies.size()) {

src/games/gameobject.h

@@ -228,7 +228,7 @@ template <class T, auto OuterMemFn, auto InnerMemFn> class NestedElementCollecti
     using InnerRange = decltype((std::declval<OuterElem>().get()->*InnerMemFn)());
     using InnerIter = decltype(std::begin(std::declval<InnerRange &>()));
 
-    T m_owner;
+    T m_iterOwner;
     OuterRange m_outerRange;
     OuterIter m_outerIt, m_outerEnd;
     InnerRange m_innerRange;
@@ -263,7 +263,7 @@ template <class T, auto OuterMemFn, auto InnerMemFn> class NestedElementCollecti
     iterator() = default;
 
     iterator(T p_owner, const bool p_isEnd)
-      : m_owner(p_owner), m_outerRange((m_owner.get()->*OuterMemFn)()),
+      : m_iterOwner(p_owner), m_outerRange((m_iterOwner.get()->*OuterMemFn)()),
         m_outerIt(std::begin(m_outerRange)), m_outerEnd(std::end(m_outerRange))
     {
       if (p_isEnd) {