mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 08:55:25 +02:00
Code Issues Wiki Activity

Bug 579457 - IllegalStateException in o.e.cdt.jsoncdb.core.CompileCommandsJsonParser

Browse source 
Signed-off-by: Martin Weber <fifteenknots505@gmail.com>

Change-Id: I7ac3f02cca706aa0308662a8be3e783dfca4fa3c
This commit is contained in:
Martin Weber 2022-03-28 21:13:41 +02:00
parent db4bc74334
commit b04155272e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java
View file

@ -346,7 +346,7 @@ public class CompileCommandsJsonParser {
Map<String, String> effectiveDefines = Stream
.concat(builtinDefines.entrySet().stream(), fileResult.getDefines().entrySet().stream())
.collect(Collectors.toMap(stringPooler.compose(Map.Entry::getKey),
stringPooler.compose(Map.Entry::getValue)));
stringPooler.compose(Map.Entry::getValue), (e1, e2) -> e1));
List<String> includePaths = Stream
.concat(fileResult.getIncludePaths().stream(), builtinDetectorsResult.getIncludePaths().stream())
.map(stringPooler).collect(Collectors.toList());