[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-634-gaf34df7
Kitware Robot
kwrobot at kitware.com
Wed Mar 29 13:25:03 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via af34df7415c288c64b816938992e5b9ecfe5d312 (commit)
via 48cfb295a2810e541bd286f352d77d840be345f7 (commit)
via 90bb5f64a48265cee1ec6c1f57c5ac57b632fd68 (commit)
via ab5f4e81f305e48234546583a2c8c4334cea78f0 (commit)
via f8ed8bef84dcd4746ee223bd34f05b7c995cb363 (commit)
via 8647c6cd6825764b8cd69828c185bad14ffc8a7e (commit)
via 21a6ed49f2d06982e080eb5fc2f0a7d1c2ea0846 (commit)
via a2275bdd636987abcf002fad000c4f02d615d219 (commit)
from c9728d7adef051ae309d8dfa3cce1f505936e4cf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af34df7415c288c64b816938992e5b9ecfe5d312
commit af34df7415c288c64b816938992e5b9ecfe5d312
Merge: c9728d7 48cfb29
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Mar 29 17:17:18 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 29 13:17:21 2017 -0400
Stage topic 'iwyu'
Topic-id: 23274
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/626
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48cfb295a2810e541bd286f352d77d840be345f7
commit 48cfb295a2810e541bd286f352d77d840be345f7
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sat Mar 25 00:03:48 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Mar 29 18:48:48 2017 +0200
cmFortranParser: remove unnecessary typedef
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;
};
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90bb5f64a48265cee1ec6c1f57c5ac57b632fd68
commit 90bb5f64a48265cee1ec6c1f57c5ac57b632fd68
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sat Mar 25 00:00:29 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Mar 29 18:48:47 2017 +0200
cmCommandArgumentParserHelper: remove unnecessary include
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 <cm_kwiml.h>
-
#include "cmCommandArgumentLexer.h"
#include "cmMakefile.h"
#include "cmState.h"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab5f4e81f305e48234546583a2c8c4334cea78f0
commit ab5f4e81f305e48234546583a2c8c4334cea78f0
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Mar 24 23:59:53 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Mar 29 18:48:47 2017 +0200
cmFortranParserImpl: remove unnecessary include
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 <assert.h>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8ed8bef84dcd4746ee223bd34f05b7c995cb363
commit f8ed8bef84dcd4746ee223bd34f05b7c995cb363
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Mar 24 23:58:37 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Mar 29 18:48:47 2017 +0200
testEncoding: use cmsys::ifstream
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 <fstream>
+#include <cmsys/FStream.hxx>
#include <iostream>
#include <string>
@@ -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;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8647c6cd6825764b8cd69828c185bad14ffc8a7e
commit 8647c6cd6825764b8cd69828c185bad14ffc8a7e
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Mar 24 23:57:42 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Mar 29 18:48:47 2017 +0200
testEncoding: include <cmsys/ConsoleBuf.hxx> on Windows only
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 <iostream>
#include <string>
+#ifdef _WIN32
#include <cmsys/ConsoleBuf.hxx>
+#endif
#ifdef _WIN32
void setEncoding(cmsys::ConsoleBuf::Manager& buf, UINT codepage)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21a6ed49f2d06982e080eb5fc2f0a7d1c2ea0846
commit 21a6ed49f2d06982e080eb5fc2f0a7d1c2ea0846
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Mar 24 23:56:00 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Mar 29 18:48:47 2017 +0200
cmFileCommand: add <cm_curl.h> include
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 <cm_curl.h>
#endif
#if defined(CMAKE_USE_ELF_PARSER)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2275bdd636987abcf002fad000c4f02d615d219
commit a2275bdd636987abcf002fad000c4f02d615d219
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Mar 24 23:54:58 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Mar 29 18:48:47 2017 +0200
cmFileCommand: remove unnecessary friend declaration
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;
-----------------------------------------------------------------------
Summary of changes:
Source/cmCommandArgumentParserHelper.cxx | 2 --
Source/cmFileCommand.cxx | 3 +--
Source/cmFortranParser.h | 3 +--
Source/cmFortranParserImpl.cxx | 1 -
Tests/CMakeLib/testEncoding.cxx | 6 ++++--
5 files changed, 6 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list