From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 20 Feb 2020 15:52:08 +0000 (-0800)
Subject: Fixes for older compilers
X-Git-Tag: working-ls180~780^2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=78929e8c3d399d47a36bb974eed74e53a3840402;p=yosys.git

Fixes for older compilers
---

diff --git a/kernel/timinginfo.h b/kernel/timinginfo.h
index 7855ddd15..5a6f4aa28 100644
--- a/kernel/timinginfo.h
+++ b/kernel/timinginfo.h
@@ -38,7 +38,14 @@ struct TimingInfo
 		bool operator!=(const NameBit& nb) const { return !operator==(nb); }
 		unsigned int hash() const { return mkhash_add(name.hash(), offset); }
 	};
-	typedef std::pair<NameBit,NameBit> BitBit;
+	struct BitBit
+	{
+		NameBit first, second;
+		BitBit(const NameBit &first, const NameBit &second) : first(first), second(second) {}
+		BitBit(const SigBit &first, const SigBit &second) : first(first), second(second) {}
+		bool operator==(const BitBit& bb) const { return bb.first == first && bb.second == second; }
+		unsigned int hash() const { return mkhash_add(first.hash(), second.hash()); }
+	};
 
 	struct ModuleTiming
 	{
diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index cffcc189e..b0bd81698 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -680,7 +680,7 @@ void prep_box(RTLIL::Design *design, bool dff_mode)
 					first = false;
 				else
 					ss << " ";
-				auto jt = t.find(std::make_pair(TimingInfo::NameBit(i),TimingInfo::NameBit(o)));
+				auto jt = t.find(TimingInfo::BitBit(i,o));
 				if (jt == t.end())
 					ss << "-";
 				else