diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java
index d6315cffc5a..b7f8bcd30d9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java
@@ -257,7 +257,7 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope {
 			IPDOMVisitor visitor= new PopulateMap(map);
 			visitor.visit(ct);
 			ct.acceptUncached(visitor);
-			pdom.putCachedResult(key, new SoftReference<CharArrayObjectMap<?>>(map));
+			pdom.putCachedResult(key, new SoftReference<>(map));
 		}
 		return map;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java
index ddce4e788e2..f10239c44de 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java
@@ -153,11 +153,11 @@ class PDOMCPPEnumScope implements ICPPEnumScope, IIndexScope {
 			// there is no cache, build it:
 			List<IPDOMCPPEnumerator> enumerators = new ArrayList<>();
 			enumeration.loadEnumerators(enumerators);
-			map = new CharArrayObjectMap<IPDOMCPPEnumerator>(enumerators.size());
+			map = new CharArrayObjectMap<>(enumerators.size());
 			for (IPDOMCPPEnumerator enumerator : enumerators) {
 				map.put(enumerator.getNameCharArray(), enumerator);
 			}
-			pdom.putCachedResult(key, new SoftReference<CharArrayObjectMap<?>>(map));
+			pdom.putCachedResult(key, new SoftReference<>(map));
 		}
 		return map;
 	}