From 148c08d722e993e20422f7853667b699cefb3a2d Mon Sep 17 00:00:00 2001
From: Tommy Muir <tommy.muir@cellebrite.com>
Date: Sun, 4 Aug 2024 20:24:06 +0100
Subject: [PATCH] Use STL containers when requiring pointer/iterator stability

---
 differ.h | 2 +-
 reader.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/differ.h b/differ.h
index e8c2f047..ca6cb459 100644
--- a/differ.h
+++ b/differ.h
@@ -32,7 +32,7 @@ namespace security::bindiff {
 class MatchingContext;
 
 // These need to be sorted
-using Histogram = absl::btree_map<std::string, size_t>;
+using Histogram = std::map<std::string, size_t>;
 using Confidences = absl::btree_map<std::string, double>;
 
 // Main entry point to the differ, runs the core algorithm and produces a
diff --git a/reader.h b/reader.h
index 1d4bc7e9..fc270acf 100644
--- a/reader.h
+++ b/reader.h
@@ -32,7 +32,7 @@ struct FlowGraphInfo {
   int edge_count = 0;
   int instruction_count = 0;
 };
-using FlowGraphInfos = absl::btree_map<Address, FlowGraphInfo>;
+using FlowGraphInfos = std::map<Address, FlowGraphInfo>;
 
 struct FixedPointInfo {
   friend bool operator==(const FixedPointInfo& lhs, const FixedPointInfo& rhs) {
@@ -69,7 +69,7 @@ struct FixedPointInfo {
   bool evaluate;
   bool comments_ported;
 };
-using FixedPointInfos = absl::btree_set<FixedPointInfo>;
+using FixedPointInfos = std::set<FixedPointInfo>;
 
 bool operator<(const FixedPointInfo& one, const FixedPointInfo& two);