Skip to content

Commit 01b6141

Browse files
Fix duplicate findtoken.h in lib/cppcheck.vcxproj (danmar#7193)
Co-authored-by: Oliver Stöneberg <[email protected]>
1 parent 48171bc commit 01b6141

File tree

2 files changed

+23
-26
lines changed

2 files changed

+23
-26
lines changed

lib/cppcheck.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@
141141
<ClInclude Include="errortypes.h" />
142142
<ClInclude Include="filesettings.h" />
143143
<ClInclude Include="findtoken.h" />
144-
<ClInclude Include="findtoken.h" />
145144
<ClInclude Include="forwardanalyzer.h" />
146145
<ClInclude Include="fwdanalysis.h" />
147146
<ClInclude Include="importproject.h" />

tools/dmake/dmake.cpp

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -461,28 +461,27 @@ int main(int argc, char **argv)
461461
}
462462

463463
// TODO: add files without source via parsing
464-
std::vector<std::string> libfiles_h;
464+
std::set<std::string> libfiles_h;
465465
for (const std::string &libfile : libfiles) {
466466
std::string fname(libfile.substr(4));
467467
fname.erase(fname.find(".cpp"));
468-
libfiles_h.emplace_back(fname + ".h");
468+
libfiles_h.emplace(fname + ".h");
469469
}
470-
libfiles_h.emplace_back("analyzer.h");
471-
libfiles_h.emplace_back("calculate.h");
472-
libfiles_h.emplace_back("config.h");
473-
libfiles_h.emplace_back("filesettings.h");
474-
libfiles_h.emplace_back("findtoken.h");
475-
libfiles_h.emplace_back("json.h");
476-
libfiles_h.emplace_back("matchcompiler.h");
477-
libfiles_h.emplace_back("precompiled.h");
478-
libfiles_h.emplace_back("smallvector.h");
479-
libfiles_h.emplace_back("sourcelocation.h");
480-
libfiles_h.emplace_back("tokenrange.h");
481-
libfiles_h.emplace_back("valueptr.h");
482-
libfiles_h.emplace_back("version.h");
483-
libfiles_h.emplace_back("vf_analyze.h");
484-
libfiles_h.emplace_back("xml.h");
485-
std::sort(libfiles_h.begin(), libfiles_h.end());
470+
libfiles_h.emplace("analyzer.h");
471+
libfiles_h.emplace("calculate.h");
472+
libfiles_h.emplace("config.h");
473+
libfiles_h.emplace("filesettings.h");
474+
libfiles_h.emplace("findtoken.h");
475+
libfiles_h.emplace("json.h");
476+
libfiles_h.emplace("matchcompiler.h");
477+
libfiles_h.emplace("precompiled.h");
478+
libfiles_h.emplace("smallvector.h");
479+
libfiles_h.emplace("sourcelocation.h");
480+
libfiles_h.emplace("tokenrange.h");
481+
libfiles_h.emplace("valueptr.h");
482+
libfiles_h.emplace("version.h");
483+
libfiles_h.emplace("vf_analyze.h");
484+
libfiles_h.emplace("xml.h");
486485

487486
std::vector<std::string> clifiles_h;
488487
for (const std::string &clifile : clifiles) {
@@ -493,13 +492,12 @@ int main(int argc, char **argv)
493492
clifiles_h.emplace_back(fname + ".h");
494493
}
495494

496-
std::vector<std::string> testfiles_h;
497-
testfiles_h.emplace_back("fixture.h");
498-
testfiles_h.emplace_back("helpers.h");
499-
testfiles_h.emplace_back("options.h");
500-
testfiles_h.emplace_back("precompiled.h");
501-
testfiles_h.emplace_back("redirect.h");
502-
std::sort(testfiles_h.begin(), testfiles_h.end());
495+
std::set<std::string> testfiles_h;
496+
testfiles_h.emplace("fixture.h");
497+
testfiles_h.emplace("helpers.h");
498+
testfiles_h.emplace("options.h");
499+
testfiles_h.emplace("precompiled.h");
500+
testfiles_h.emplace("redirect.h");
503501

504502
// TODO: write filter files
505503
// Visual Studio projects

0 commit comments

Comments
 (0)