Attempt to Windows-proof common MSVC issues.

Author: tturocy

src/games/game.h

@@ -985,8 +985,7 @@ class GameRep::Infosets {
     iterator(outer_iter outer, outer_iter outer_end) : outer_(outer), outer_end_(outer_end)
     {
       if (outer_ != outer_end_) {
-        inner_ = (*outer_)->m_infosets.begin();
-        inner_end_ = (*outer_)->m_infosets.end();
+        init_inner();
         satisfy_invariant();
       }
     }
@@ -1001,21 +1000,44 @@ class GameRep::Infosets {
       return *this;
     }
 
+    // -------- Windows/MSVC-safe equality ----------
     bool operator==(const iterator &other) const
     {
-      return outer_ == other.outer_ && (outer_ == outer_end_ || inner_ == other.inner_);
+      // Both are end() ⇒ equal
+      if (is_end() && other.is_end()) {
+        return true;
+      }
+
+      // Otherwise, must match outer + inner (safe because both non-end)
+      return outer_ == other.outer_ && inner_ == other.inner_;
     }
 
     bool operator!=(const iterator &other) const { return !(*this == other); }
 
   private:
+    bool is_end() const { return outer_ == outer_end_; }
+
+    // Safe initialization even when shared_ptr is null
+    void init_inner()
+    {
+      const auto &playerPtr = *outer_;
+
+      if (!playerPtr) {
+        // Null shared_ptr → no infosets
+        inner_ = inner_end_ = inner_iter{};
+        return;
+      }
+
+      inner_ = playerPtr->m_infosets.begin();
+      inner_end_ = playerPtr->m_infosets.end();
+    }
+
     void satisfy_invariant()
     {
-      while (outer_ != outer_end_ && inner_ == inner_end_) {
+      while (!is_end() && inner_ == inner_end_) {
         ++outer_;
-        if (outer_ != outer_end_) {
-          inner_ = (*outer_)->m_infosets.begin();
-          inner_end_ = (*outer_)->m_infosets.end();
+        if (!is_end()) {
+          init_inner();
         }
       }
     }
@@ -1027,14 +1049,16 @@ class GameRep::Infosets {
   };
 
   // View interface
-  iterator begin() const { return {players_.begin(), players_.end()}; }
+  iterator begin() const { return iterator(players_->begin(), players_->end()); }
+  iterator end() const { return iterator(players_->end(), players_->end()); }
 
-  iterator end() const { return {players_.end(), players_.end()}; }
-
-  explicit Infosets(const GameRep *game) : players_(game->m_players) {}
+  explicit Infosets(const GameRep *game)
+    : players_(&game->m_players) // ✔ store pointer, not reference
+  {
+  }
 
 private:
-  const std::vector<std::shared_ptr<GamePlayerRep>> &players_;
+  const std::vector<std::shared_ptr<GamePlayerRep>> *players_;
 };
 
 inline GameRep::Infosets GameRep::GetInfosets() const { return Infosets(this); }

tests/test_actions.py

@@ -231,7 +231,6 @@ def test_strategy_action_raises_value_error_for_wrong_player(game, player_ind, i
 def test_strategy_action_raises_error_for_strategic_game():
     """Verify `Strategy.action` retrieves the action prescribed by the strategy
     """
-    return
     game_efg = games.read_from_file("e02.efg")
     game_nfg = game_efg.from_arrays(game_efg.to_arrays()[0], game_efg.to_arrays()[1])
     alice = game_nfg.players[0]