mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 01:36:01 +02:00
Code Issues Wiki Activity

Merge branch 'master' into sd90

Browse source
This commit is contained in:
Andrew Gvozdev 2011-07-16 14:07:19 -04:00
commit 882050ba48
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnChecker.java
View file

@ -93,7 +93,7 @@ public class ReturnChecker extends AbstractAstFunctionChecker {
public int visit(IASTStatement stmt) { public int visit(IASTStatement stmt) {
if (stmt instanceof IASTReturnStatement) { if (stmt instanceof IASTReturnStatement) {
IASTReturnStatement ret = (IASTReturnStatement) stmt; IASTReturnStatement ret = (IASTReturnStatement) stmt;
boolean hasValue = ret.getReturnValue() != null; boolean hasValue = ret.getReturnArgument() != null;
if (hasret == false && hasValue) { if (hasret == false && hasValue) {
hasret = true; hasret = true;
} }

9
codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java
View file

@ -289,4 +289,13 @@ public class ReturnCheckerTest extends CheckerTestCase {
loadCodeAndRunCpp(getAboveComment()); loadCodeAndRunCpp(getAboveComment());
checkNoErrors(); checkNoErrors();
} }
// #include <vector>
// std::vector<int> f() {
// return {1,2,3};
// }
public void testReturnInitializerList() {
loadCodeAndRunCpp(getAboveComment());
checkNoErrors();
}
} }

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
View file

@ -1311,6 +1311,8 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
} }
private void preDeleteProject(IProject project) { private void preDeleteProject(IProject project) {
// remove binary parsers
binaryParsersMap.remove(project);
// stop the binary runner for this project // stop the binary runner for this project
removeBinaryRunner(project); removeBinaryRunner(project);
// stop indexing jobs for this project // stop indexing jobs for this project