From c4dc67cfc5a5d1f08b1f039f3064c0f49dcece93 Mon Sep 17 00:00:00 2001
From: jeffro256 <jeffro256@tutanota.com>
Date: Sat, 19 Apr 2025 21:30:08 -0500
Subject: [PATCH] carrot_impl: use std::variant in scanning_tools

---
 src/wallet/scanning_tools.cpp | 21 ++++++++++++---------
 src/wallet/scanning_tools.h   |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/wallet/scanning_tools.cpp b/src/wallet/scanning_tools.cpp
index fcdc24824..7472b0647 100644
--- a/src/wallet/scanning_tools.cpp
+++ b/src/wallet/scanning_tools.cpp
@@ -537,15 +537,18 @@ std::optional<enote_view_incoming_scan_info_t> view_incoming_scan_enote(
         hw::device &hwdev;
     };
 
-    return enote.visit(view_incoming_scan_enote_visitor{local_output_index,
-        tx_extra_nonce,
-        encrypted_payment_id,
-        main_derivations,
-        additional_derivations,
-        address,
-        k_view_dev,
-        subaddress_map,
-        hwdev});
+    return std::visit(
+        view_incoming_scan_enote_visitor{local_output_index,
+            tx_extra_nonce,
+            encrypted_payment_id,
+            main_derivations,
+            additional_derivations,
+            address,
+            k_view_dev,
+            subaddress_map,
+            hwdev
+        },
+        enote);
 }
 //-------------------------------------------------------------------------------------------------------------------
 std::optional<enote_view_incoming_scan_info_t> view_incoming_scan_enote(
diff --git a/src/wallet/scanning_tools.h b/src/wallet/scanning_tools.h
index fda198387..f9066f869 100644
--- a/src/wallet/scanning_tools.h
+++ b/src/wallet/scanning_tools.h
@@ -89,7 +89,7 @@ struct PreCarrotEnote
     rct::ecdhTuple amount;
 };
 
-using MoneroEnoteVariant = tools::variant<PreCarrotEnote,
+using MoneroEnoteVariant = std::variant<PreCarrotEnote,
     carrot::CarrotCoinbaseEnoteV1,
     carrot::CarrotEnoteV1>;