diff options
16 files changed, 129 insertions, 52 deletions
diff --git a/src/tools/clangrefactoringbackend/source/clangquery.cpp b/src/tools/clangrefactoringbackend/source/clangquery.cpp index 95ec23affb..d24b981f45 100644 --- a/src/tools/clangrefactoringbackend/source/clangquery.cpp +++ b/src/tools/clangrefactoringbackend/source/clangquery.cpp @@ -33,8 +33,11 @@ #include <QTime> #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/ASTMatchers/ASTMatchers.h> @@ -43,7 +46,9 @@ #include <clang/ASTMatchers/Dynamic/Parser.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif using clang::ast_matchers::dynamic::Diagnostics; diff --git a/src/tools/clangrefactoringbackend/source/clangtool.h b/src/tools/clangrefactoringbackend/source/clangtool.h index fd4ca4b9e5..e75d020e60 100644 --- a/src/tools/clangrefactoringbackend/source/clangtool.h +++ b/src/tools/clangrefactoringbackend/source/clangtool.h @@ -33,14 +33,19 @@ #include <sourcelocationscontainer.h> #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include "clang/Tooling/Refactoring.h" #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif #include <utils/smallstring.h> diff --git a/src/tools/clangrefactoringbackend/source/findcursorusr.h b/src/tools/clangrefactoringbackend/source/findcursorusr.h index b534d27f62..0c228c67e8 100644 --- a/src/tools/clangrefactoringbackend/source/findcursorusr.h +++ b/src/tools/clangrefactoringbackend/source/findcursorusr.h @@ -26,8 +26,11 @@ #pragma once #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/AST/AST.h> @@ -37,7 +40,9 @@ #include <llvm/ADT/SmallVector.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif #include <vector> diff --git a/src/tools/clangrefactoringbackend/source/findlocationsofusrs.h b/src/tools/clangrefactoringbackend/source/findlocationsofusrs.h index 9362d9c2f8..d608faec1d 100644 --- a/src/tools/clangrefactoringbackend/source/findlocationsofusrs.h +++ b/src/tools/clangrefactoringbackend/source/findlocationsofusrs.h @@ -28,8 +28,11 @@ #include "findcursorusr.h" #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/AST/ASTContext.h> @@ -39,7 +42,9 @@ #include <llvm/ADT/SmallVector.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif #include <vector> diff --git a/src/tools/clangrefactoringbackend/source/findusrforcursoraction.cpp b/src/tools/clangrefactoringbackend/source/findusrforcursoraction.cpp index 2ea0d1353d..50f7230586 100644 --- a/src/tools/clangrefactoringbackend/source/findusrforcursoraction.cpp +++ b/src/tools/clangrefactoringbackend/source/findusrforcursoraction.cpp @@ -28,8 +28,11 @@ #include "findcursorusr.h" #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/AST/AST.h> @@ -37,7 +40,9 @@ #include <clang/AST/ASTContext.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif #include <algorithm> diff --git a/src/tools/clangrefactoringbackend/source/findusrforcursoraction.h b/src/tools/clangrefactoringbackend/source/findusrforcursoraction.h index 0bdd2bb4df..65ec394e7d 100644 --- a/src/tools/clangrefactoringbackend/source/findusrforcursoraction.h +++ b/src/tools/clangrefactoringbackend/source/findusrforcursoraction.h @@ -30,14 +30,19 @@ #include <utils/smallstring.h> #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include "clang/Frontend/FrontendAction.h" #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif namespace clang { diff --git a/src/tools/clangrefactoringbackend/source/locationsourcefilecallbacks.cpp b/src/tools/clangrefactoringbackend/source/locationsourcefilecallbacks.cpp index c5f2d4edde..cc6e8e609a 100644 --- a/src/tools/clangrefactoringbackend/source/locationsourcefilecallbacks.cpp +++ b/src/tools/clangrefactoringbackend/source/locationsourcefilecallbacks.cpp @@ -28,15 +28,20 @@ #include "macropreprocessorcallbacks.h" #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/Frontend/CompilerInstance.h> #include <clang/Lex/Preprocessor.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif #include <memory> diff --git a/src/tools/clangrefactoringbackend/source/locationsourcefilecallbacks.h b/src/tools/clangrefactoringbackend/source/locationsourcefilecallbacks.h index 98f4cb9aea..fe23e3e5a5 100644 --- a/src/tools/clangrefactoringbackend/source/locationsourcefilecallbacks.h +++ b/src/tools/clangrefactoringbackend/source/locationsourcefilecallbacks.h @@ -28,14 +28,19 @@ #include <sourcelocationscontainer.h> #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/Tooling/Tooling.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif namespace llvm { diff --git a/src/tools/clangrefactoringbackend/source/macropreprocessorcallbacks.h b/src/tools/clangrefactoringbackend/source/macropreprocessorcallbacks.h index cbc1edc9fd..6c6010b2bb 100644 --- a/src/tools/clangrefactoringbackend/source/macropreprocessorcallbacks.h +++ b/src/tools/clangrefactoringbackend/source/macropreprocessorcallbacks.h @@ -30,8 +30,11 @@ #include <sourcelocationscontainer.h> #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/Basic/SourceManager.h> @@ -40,7 +43,9 @@ #include <clang/Lex/MacroInfo.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif #include <QDebug> diff --git a/src/tools/clangrefactoringbackend/source/refactoringcompilationdatabase.h b/src/tools/clangrefactoringbackend/source/refactoringcompilationdatabase.h index 8528c10b27..bac6465c8e 100644 --- a/src/tools/clangrefactoringbackend/source/refactoringcompilationdatabase.h +++ b/src/tools/clangrefactoringbackend/source/refactoringcompilationdatabase.h @@ -23,18 +23,22 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_REFACTORINGCOMPILATIONDATABASE_H -#define CLANGBACKEND_REFACTORINGCOMPILATIONDATABASE_H +#pragma once #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include "clang/Tooling/CompilationDatabase.h" #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif namespace ClangBackEnd { @@ -58,5 +62,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_REFACTORINGCOMPILATIONDATABASE_H diff --git a/src/tools/clangrefactoringbackend/source/sourcelocationsutils.h b/src/tools/clangrefactoringbackend/source/sourcelocationsutils.h index eda4accf70..0747d803bb 100644 --- a/src/tools/clangrefactoringbackend/source/sourcelocationsutils.h +++ b/src/tools/clangrefactoringbackend/source/sourcelocationsutils.h @@ -29,8 +29,11 @@ #include <sourcerangescontainer.h> #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/Basic/SourceManager.h> @@ -39,7 +42,9 @@ #include <llvm/Support/FileUtilities.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif #include <iterator> diff --git a/src/tools/clangrefactoringbackend/source/sourcerangeextractor.cpp b/src/tools/clangrefactoringbackend/source/sourcerangeextractor.cpp index d4f6ba6cec..18b6288cae 100644 --- a/src/tools/clangrefactoringbackend/source/sourcerangeextractor.cpp +++ b/src/tools/clangrefactoringbackend/source/sourcerangeextractor.cpp @@ -30,8 +30,11 @@ #include <sourcerangescontainer.h> #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/Basic/SourceManager.h> @@ -41,7 +44,9 @@ #include <llvm/ADT/SmallVector.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif namespace ClangBackEnd { diff --git a/src/tools/clangrefactoringbackend/source/symbolfinder.h b/src/tools/clangrefactoringbackend/source/symbolfinder.h index 3a9999f66b..42c7098f1e 100644 --- a/src/tools/clangrefactoringbackend/source/symbolfinder.h +++ b/src/tools/clangrefactoringbackend/source/symbolfinder.h @@ -33,14 +33,19 @@ #include <sourcelocationscontainer.h> #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include "clang/Tooling/Refactoring.h" #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif namespace ClangBackEnd { diff --git a/src/tools/clangrefactoringbackend/source/symbollocationfinderaction.h b/src/tools/clangrefactoringbackend/source/symbollocationfinderaction.h index 413f264fe5..7bee18f94b 100644 --- a/src/tools/clangrefactoringbackend/source/symbollocationfinderaction.h +++ b/src/tools/clangrefactoringbackend/source/symbollocationfinderaction.h @@ -30,14 +30,19 @@ #include <sourcelocationscontainer.h> #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/Tooling/Refactoring.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif namespace clang { diff --git a/tests/unit/unittest/gtest-clang-printing.cpp b/tests/unit/unittest/gtest-clang-printing.cpp index 7b9167540e..4e488379d8 100644 --- a/tests/unit/unittest/gtest-clang-printing.cpp +++ b/tests/unit/unittest/gtest-clang-printing.cpp @@ -24,8 +24,11 @@ ****************************************************************************/ #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #ifdef CLANG_UNIT_TESTS @@ -34,7 +37,9 @@ #endif #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif #include <gtest/gtest-printers.h> diff --git a/tests/unit/unittest/sourcerangeextractor-test.cpp b/tests/unit/unittest/sourcerangeextractor-test.cpp index 759ee2cd7f..5d3de03054 100644 --- a/tests/unit/unittest/sourcerangeextractor-test.cpp +++ b/tests/unit/unittest/sourcerangeextractor-test.cpp @@ -30,15 +30,20 @@ #include <sourcerangescontainer.h> #if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning( disable : 4100 ) #endif #include <clang/Basic/SourceManager.h> #include <clang/Lex/Lexer.h> #if defined(__GNUC__) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) #endif using testing::Contains; |