Skip to content

Cleanup: unnecessary includes, fix include order, fix unreferenced va… #3418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 3 commits into from
Aug 26, 2021
Merged

Cleanup: unnecessary includes, fix include order, fix unreferenced va… #3418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82ee940
Cleanup: unnecessary includes, fix include order, fix unreferenced va…
chrchr-github Aug 25, 2021
c92d808
Fix compilation for non-MSVC compilers
chrchr-github Aug 25, 2021
65e2d21
Define USE_WINDOWS_SEH only for MSVC
chrchr-github Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cli/cppcheckexecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,13 @@
#include <execinfo.h>
#endif

#if defined(_WIN32)
#if defined(_MSC_VER)
#define USE_WINDOWS_SEH
#endif
#include <Windows.h>
#include <DbgHelp.h>
#include <TCHAR.H>
#include <Windows.h>
#include <excpt.h>
#endif

Expand Down
6 changes: 2 additions & 4 deletions cli/threadexecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
#include <cstring>
#include <iostream>
#include <utility>
#include <future>
#include <numeric>

#ifdef __SVR4 // Solaris
#include <sys/loadavg.h>
Expand All @@ -48,8 +46,8 @@
#include <unistd.h>
#endif
#ifdef THREADING_MODEL_WIN
#include <process.h>
#include <windows.h>
#include <future>
#include <numeric>
#endif

// required for FD_ZERO
Expand Down
2 changes: 0 additions & 2 deletions cli/threadexecutor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
#define THREADING_MODEL_FORK
#elif defined(_WIN32)
#define THREADING_MODEL_WIN
#include <windows.h>

#include "importproject.h"
#endif

Expand Down
4 changes: 2 additions & 2 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2263,7 +2263,7 @@ bool Tokenizer::simplifyUsing()
Token::Match(tok, "using namespace %name% ;|::")) {
try {
setScopeInfo(tok, &currentScope, mSettings->debugwarnings);
} catch (const std::runtime_error &e) {
} catch (const std::runtime_error &) {
reportError(tok, Severity::debug, "simplifyUsingUnmatchedBodyEnd",
"simplifyUsing: unmatched body end");
}
Expand Down Expand Up @@ -2417,7 +2417,7 @@ bool Tokenizer::simplifyUsing()
Token::Match(tok1, "using namespace %name% ;|::")) {
try {
setScopeInfo(tok1, &currentScope1, mSettings->debugwarnings);
} catch (const std::runtime_error &e) {
} catch (const std::runtime_error &) {
reportError(tok1, Severity::debug, "simplifyUsingUnmatchedBodyEnd",
"simplifyUsing: unmatched body end");
}
Expand Down