From c34988bbbdf6fae49ca7a426d823abf5e55f27ad Mon Sep 17 00:00:00 2001
From: sethcg <sethcg@hotmail.com>
Date: Sat, 15 Feb 2025 16:02:16 -0500
Subject: [PATCH] Fixed some references to generic types

---
 .../app/plugin/core/disassembler/EntryPointAnalyzer.java      | 2 +-
 .../app/util/bin/format/dwarf/attribs/DWARFAttributeDef.java  | 2 +-
 .../main/java/ghidra/app/util/cparser/CPP/DefineTable.java    | 2 +-
 .../src/main/java/ghidra/pcodeCPort/utils/WeakHashMap2.java   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/EntryPointAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/EntryPointAnalyzer.java
index af54f75371..408da77d46 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/EntryPointAnalyzer.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/EntryPointAnalyzer.java
@@ -297,7 +297,7 @@ public class EntryPointAnalyzer extends AbstractAnalyzer {
 		Listing listing = program.getListing();
 		SymbolTable symbolTable = program.getSymbolTable();
 
-		Set<Address> indirectSet = new HashSet();
+		Set<Address> indirectSet = new HashSet<Address>();
 
 		Iterator<Address> iter = doNowSet.iterator();
 		while (iter.hasNext()) {
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/attribs/DWARFAttributeDef.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/attribs/DWARFAttributeDef.java
index 63e6bae7ae..4f93cd57c0 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/attribs/DWARFAttributeDef.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/attribs/DWARFAttributeDef.java
@@ -151,7 +151,7 @@ public class DWARFAttributeDef<E extends Enum<E>> {
 		if (!(obj instanceof DWARFAttributeDef)) {
 			return false;
 		}
-		DWARFAttributeDef other = (DWARFAttributeDef) obj;
+		DWARFAttributeDef<?> other = (DWARFAttributeDef<?>) obj;
 		return attributeForm == other.attributeForm &&
 			Objects.equals(attributeId, other.attributeId) &&
 			implicitValue == other.implicitValue && rawAttributeId == other.rawAttributeId;
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java
index 9e5399afda..34f58c2a2e 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java
@@ -787,7 +787,7 @@ public class DefineTable {
 		//
 		String strValue = getValue(defName);
 
-		ArrayList<String> list = new ArrayList();
+		ArrayList<String> list = new ArrayList<String>();
 		list.add(defName);
 
 		String strExpanded = expand(strValue, true, list);
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/utils/WeakHashMap2.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/utils/WeakHashMap2.java
index 9c466fbf90..9477fd520c 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/utils/WeakHashMap2.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/utils/WeakHashMap2.java
@@ -58,7 +58,7 @@ public class WeakHashMap2<K, V> extends AbstractMap<K, V> {
 				return false;
 			}
 
-			WeakValue other = (WeakValue) o;
+			WeakValue<?> other = (WeakValue<?>) o;
 			return get() == other.get();
 		}
 
@@ -231,7 +231,7 @@ public class WeakHashMap2<K, V> extends AbstractMap<K, V> {
 	}
 
 	public K reverseGet(V value) {
-		WeakValue v = WeakValue.create(value, queue);
+		WeakValue<V> v = WeakValue.create(value, queue);
 		return reverseHash.get(v);
 	}