From a2275bdd636987abcf002fad000c4f02d615d219 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 24 Mar 2017 23:54:58 +0100 Subject: cmFileCommand: remove unnecessary friend declaration --- Source/cmFileCommand.cxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 97292f9..7a6e2b7 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1028,8 +1028,6 @@ protected: { } }; - struct MatchRule; - friend struct MatchRule; struct MatchRule { cmsys::RegularExpression Regex; -- cgit v0.12 From 21a6ed49f2d06982e080eb5fc2f0a7d1c2ea0846 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 24 Mar 2017 23:56:00 +0100 Subject: cmFileCommand: add include --- Source/cmFileCommand.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 7a6e2b7..f78b764 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -37,6 +37,7 @@ #if defined(CMAKE_BUILD_WITH_CMAKE) #include "cmCurl.h" #include "cmFileLockResult.h" +#include #endif #if defined(CMAKE_USE_ELF_PARSER) -- cgit v0.12 From 8647c6cd6825764b8cd69828c185bad14ffc8a7e Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 24 Mar 2017 23:57:42 +0100 Subject: testEncoding: include on Windows only --- Tests/CMakeLib/testEncoding.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tests/CMakeLib/testEncoding.cxx b/Tests/CMakeLib/testEncoding.cxx index 88743b0..20ba9e3 100644 --- a/Tests/CMakeLib/testEncoding.cxx +++ b/Tests/CMakeLib/testEncoding.cxx @@ -2,7 +2,9 @@ #include #include +#ifdef _WIN32 #include +#endif #ifdef _WIN32 void setEncoding(cmsys::ConsoleBuf::Manager& buf, UINT codepage) -- cgit v0.12 From f8ed8bef84dcd4746ee223bd34f05b7c995cb363 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 24 Mar 2017 23:58:37 +0100 Subject: testEncoding: use cmsys::ifstream --- Tests/CMakeLib/testEncoding.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/CMakeLib/testEncoding.cxx b/Tests/CMakeLib/testEncoding.cxx index 20ba9e3..403c896 100644 --- a/Tests/CMakeLib/testEncoding.cxx +++ b/Tests/CMakeLib/testEncoding.cxx @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -39,7 +39,7 @@ int main(int argc, char* argv[]) setEncoding(consoleOut, CP_OEMCP); } // else AUTO #endif - std::ifstream file(argv[2]); + cmsys::ifstream file(argv[2]); if (!file.is_open()) { std::cout << "Failed to open file: " << argv[2] << std::endl; return 2; -- cgit v0.12 From ab5f4e81f305e48234546583a2c8c4334cea78f0 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 24 Mar 2017 23:59:53 +0100 Subject: cmFortranParserImpl: remove unnecessary include --- Source/cmFortranParserImpl.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/cmFortranParserImpl.cxx b/Source/cmFortranParserImpl.cxx index 1a5e6c5..1abe673 100644 --- a/Source/cmFortranParserImpl.cxx +++ b/Source/cmFortranParserImpl.cxx @@ -1,7 +1,6 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFortranParser.h" -#include "cmFortranLexer.h" #include "cmSystemTools.h" #include -- cgit v0.12 From 90bb5f64a48265cee1ec6c1f57c5ac57b632fd68 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Sat, 25 Mar 2017 00:00:29 +0100 Subject: cmCommandArgumentParserHelper: remove unnecessary include --- Source/cmCommandArgumentParserHelper.cxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx index 2d66344..1222d5a 100644 --- a/Source/cmCommandArgumentParserHelper.cxx +++ b/Source/cmCommandArgumentParserHelper.cxx @@ -2,8 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCommandArgumentParserHelper.h" -#include - #include "cmCommandArgumentLexer.h" #include "cmMakefile.h" #include "cmState.h" -- cgit v0.12 From 48cfb295a2810e541bd286f352d77d840be345f7 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Sat, 25 Mar 2017 00:03:48 +0100 Subject: cmFortranParser: remove unnecessary typedef --- Source/cmFortranParser.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/cmFortranParser.h b/Source/cmFortranParser.h index e8273fb..024b00a 100644 --- a/Source/cmFortranParser.h +++ b/Source/cmFortranParser.h @@ -54,8 +54,7 @@ void cmFortranParser_RuleElse(cmFortranParser* parser); void cmFortranParser_RuleEndif(cmFortranParser* parser); /* Define the parser stack element type. */ -typedef union cmFortran_yystype_u cmFortran_yystype; -union cmFortran_yystype_u +struct cmFortran_yystype { char* string; }; -- cgit v0.12