Index: scripts/jenkins/run-unit-tests-coverage.bat =================================================================== diff -u -r591a9b3f0144389f41dd34528256f8fea8cb0238 -rbc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc --- scripts/jenkins/run-unit-tests-coverage.bat (.../run-unit-tests-coverage.bat) (revision 591a9b3f0144389f41dd34528256f8fea8cb0238) +++ scripts/jenkins/run-unit-tests-coverage.bat (.../run-unit-tests-coverage.bat) (revision bc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc) @@ -5,11 +5,15 @@ "C:\Program Files\OpenCppCoverage\OpenCppCoverage.exe" --sources src\ch --working_dir "bin\Testing Debug" --export_type=cobertura:"Coverage\ch.exe.Coverage.xml" -- "bin\Testing Debug\ch64.exe" || exit /b 1 "C:\Program Files\OpenCppCoverage\OpenCppCoverage.exe" --sources src\ictranslate --working_dir "bin\Testing Debug" --export_type=cobertura:"Coverage\ictranslate64.exe.Coverage.xml" -- "bin\Testing Debug\ictranslate64.exe" || exit /b 1 +"C:\Program Files\OpenCppCoverage\OpenCppCoverage.exe" --sources src\regchext --working_dir "bin\Testing Debug" --export_type=cobertura:"Coverage\regchext64.exe.Coverage.xml" -- "bin\Testing Debug\regchext64.exe" || exit /b 1 "C:\Program Files\OpenCppCoverage\OpenCppCoverage.exe" --sources src\chext --working_dir "bin\Testing Debug" --export_type=cobertura:"Coverage\chext64.dll.Coverage.xml" -- tools\test_runner64.exe "chext64.dll" || exit /b 1 +"C:\Program Files\OpenCppCoverage\OpenCppCoverage.exe" --sources src\libchengine --working_dir "bin\Testing Debug" --export_type=cobertura:"Coverage\libchengine64ud.dll.Coverage.xml" -- tools\test_runner64.exe "libchengine64ud.dll" || exit /b 1 "C:\Program Files\OpenCppCoverage\OpenCppCoverage.exe" --sources src\libchcore --working_dir "bin\Testing Debug" --export_type=cobertura:"Coverage\libchcore64ud.dll.Coverage.xml" -- tools\test_runner64.exe "libchcore64ud.dll" || exit /b 1 "C:\Program Files\OpenCppCoverage\OpenCppCoverage.exe" --sources src\libictranslate --working_dir "bin\Testing Debug" --export_type=cobertura:"Coverage\libictranslate64ud.dll.Coverage.xml" -- tools\test_runner64.exe "libictranslate64ud.dll" || exit /b 1 "C:\Program Files\OpenCppCoverage\OpenCppCoverage.exe" --sources src\liblogger --working_dir "bin\Testing Debug" --export_type=cobertura:"Coverage\liblogger64ud.dll.Coverage.xml" -- tools\test_runner64.exe "liblogger64ud.dll" || exit /b 1 +"C:\Program Files\OpenCppCoverage\OpenCppCoverage.exe" --sources src\libstring --working_dir "bin\Testing Debug" --export_type=cobertura:"Coverage\libstring64ud.dll.Coverage.xml" -- tools\test_runner64.exe "libstring64ud.dll" || exit /b 1 +"C:\Program Files\OpenCppCoverage\OpenCppCoverage.exe" --sources src\libserializer --working_dir "bin\Testing Debug" --export_type=cobertura:"Coverage\libserializer64ud.dll.Coverage.xml" -- tools\test_runner64.exe "libserializer64ud.dll" || exit /b 1 exit /b 0 Index: src/ch/CustomCopyDlg.cpp =================================================================== diff -u -rfadd6c9c628de875716d96c3a497b5bc6c8dca8a -rbc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc --- src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision fadd6c9c628de875716d96c3a497b5bc6c8dca8a) +++ src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision bc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc) @@ -423,15 +423,13 @@ void CCustomCopyDlg::OnRemoveButton() { - POSITION pos; - int iItem; while (true) { - pos = m_ctlFiles.GetFirstSelectedItemPosition(); + POSITION pos = m_ctlFiles.GetFirstSelectedItemPosition(); if (pos == nullptr) break; - iItem=m_ctlFiles.GetNextSelectedItem(pos); + int iItem = m_ctlFiles.GetNextSelectedItem(pos); m_ctlFiles.DeleteItem(iItem); } } @@ -695,15 +693,13 @@ { chengine::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); - POSITION pos; - int iItem; while(true) { - pos=m_ctlFilters.GetFirstSelectedItemPosition(); + POSITION pos = m_ctlFilters.GetFirstSelectedItemPosition(); if (pos == nullptr) break; - iItem=m_ctlFilters.GetNextSelectedItem(pos); + int iItem = m_ctlFilters.GetNextSelectedItem(pos); m_ctlFilters.DeleteItem(iItem); afFilters.RemoveAt(iItem); } Index: src/common/GenericTemplates/RandomAccessIterators.h =================================================================== diff -u -rfadd6c9c628de875716d96c3a497b5bc6c8dca8a -rbc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc --- src/common/GenericTemplates/RandomAccessIterators.h (.../RandomAccessIterators.h) (revision fadd6c9c628de875716d96c3a497b5bc6c8dca8a) +++ src/common/GenericTemplates/RandomAccessIterators.h (.../RandomAccessIterators.h) (revision bc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc) @@ -69,7 +69,7 @@ public: RandomAccessConstIteratorWrapper(); - RandomAccessConstIteratorWrapper(const RandomAccessIteratorWrapper& rIterator); + explicit RandomAccessConstIteratorWrapper(const RandomAccessIteratorWrapper& rIterator); ~RandomAccessConstIteratorWrapper(); RandomAccessConstIteratorWrapper& operator=(const RandomAccessIteratorWrapper& rIterator); Index: src/libchcore/Tests/TestsTPathContainer.cpp =================================================================== diff -u -rfadd6c9c628de875716d96c3a497b5bc6c8dca8a -rbc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc --- src/libchcore/Tests/TestsTPathContainer.cpp (.../TestsTPathContainer.cpp) (revision fadd6c9c628de875716d96c3a497b5bc6c8dca8a) +++ src/libchcore/Tests/TestsTPathContainer.cpp (.../TestsTPathContainer.cpp) (revision bc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc) @@ -236,7 +236,7 @@ { if (iCount == 0) EXPECT_EQ(PathFromString(L"SomeString1"), strData); - else if (iCount == 0) + else if (iCount == 1) EXPECT_EQ(PathFromString(L"SomeString2"), strData); ++iCount; } Index: src/libstring/Tests/TestsTStringArray.cpp =================================================================== diff -u -rfadd6c9c628de875716d96c3a497b5bc6c8dca8a -rbc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc --- src/libstring/Tests/TestsTStringArray.cpp (.../TestsTStringArray.cpp) (revision fadd6c9c628de875716d96c3a497b5bc6c8dca8a) +++ src/libstring/Tests/TestsTStringArray.cpp (.../TestsTStringArray.cpp) (revision bc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc) @@ -255,7 +255,7 @@ { if (iCount == 0) EXPECT_EQ(TString(L"SomeString1"), strData); - else if (iCount == 0) + else if (iCount == 1) EXPECT_EQ(TString(L"SomeString2"), strData); ++iCount; } Index: src/libstring/Tests/TestsTStringSet.cpp =================================================================== diff -u -rfadd6c9c628de875716d96c3a497b5bc6c8dca8a -rbc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc --- src/libstring/Tests/TestsTStringSet.cpp (.../TestsTStringSet.cpp) (revision fadd6c9c628de875716d96c3a497b5bc6c8dca8a) +++ src/libstring/Tests/TestsTStringSet.cpp (.../TestsTStringSet.cpp) (revision bc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc) @@ -172,7 +172,7 @@ { if (iCount == 0) EXPECT_EQ(TString(L"SomeString1"), strData); - else if (iCount == 0) + else if (iCount == 1) EXPECT_EQ(TString(L"SomeString2"), strData); ++iCount; }