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, master has been updated
via ecf3c5c6f322168e11aa37d899b076ef4abc5625 (commit)
via 49b3ebf5f5b0500eea9f5e241c5d5024fa3a95fa (commit)
via db89590f364c9c95628b367914188ca6a63b8eab (commit)
via 5bcfe98bd5215d8fc1638879c3ee92ca2c1383b8 (commit)
via 70e245f19ec8e753784db6a1153c64e5f5eec16a (commit)
from f2a78aeed94e9ccf76c1268e8ed934669a08d389 (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=ecf3c5c6f322168e11aa37d899b076ef4abc5625
commit ecf3c5c6f322168e11aa37d899b076ef4abc5625
Merge: 49b3ebf 5bcfe98
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 10 13:00:35 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jan 10 08:00:44 2019 -0500
Merge topic 'fix-msvc-warnings'
5bcfe98bd5 Source: Fix various compiler warnings in Visual Studio 2017
70e245f19e cmAlgorithms: add utility functions to get signed size of
containers
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2757
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49b3ebf5f5b0500eea9f5e241c5d5024fa3a95fa
commit 49b3ebf5f5b0500eea9f5e241c5d5024fa3a95fa
Merge: f2a78ae db89590f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 10 12:55:38 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jan 10 07:55:46 2019 -0500
Merge topic 'better_sphinx_colors'
db89590f36 Help: CMakeTemplateStyle uses colors that better contrast.
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2779
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db89590f364c9c95628b367914188ca6a63b8eab
commit db89590f364c9c95628b367914188ca6a63b8eab
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Wed Jan 9 14:01:30 2019 -0500
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Wed Jan 9 15:53:26 2019 -0500
Help: CMakeTemplateStyle uses colors that better contrast.
diff --git a/Utilities/Sphinx/colors.py b/Utilities/Sphinx/colors.py
index f98a483..dae0063 100644
--- a/Utilities/Sphinx/colors.py
+++ b/Utilities/Sphinx/colors.py
@@ -14,14 +14,14 @@ class CMakeTemplateStyle(Style):
styles = {
Whitespace: "#bbbbbb",
Comment: "italic #408080",
- Operator: "bold #000000",
+ Operator: "#555555",
String: "#217A21",
Number: "#105030",
- Name.Builtin: "#400080", # anything lowercase
- Name.Function: "bold #1010A0", # function
+ Name.Builtin: "#333333", # anything lowercase
+ Name.Function: "#007020", # function
Name.Variable: "#1080B0", # <..>
- Name.Tag: "#19177C", # ${..}
- Name.Constant: "#6020E0", # uppercase only
+ Name.Tag: "#bb60d5", # ${..}
+ Name.Constant: "#4070a0", # uppercase only
Name.Entity: "italic #70A020", # @..@
Name.Attribute: "#906060", # paths, URLs
Name.Label: "#A0A000", # anything left over
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bcfe98bd5215d8fc1638879c3ee92ca2c1383b8
commit 5bcfe98bd5215d8fc1638879c3ee92ca2c1383b8
Author: Bruno Manganelli <bruno.mang...@gmail.com>
AuthorDate: Mon Dec 24 12:11:26 2018 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 9 08:25:10 2019 -0500
Source: Fix various compiler warnings in Visual Studio 2017
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 065a184..1d9621c 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -407,7 +407,7 @@ char CCONV* cmExpandVariablesInString(void* arg, const
char* source,
cmMakefile* mf = static_cast<cmMakefile*>(arg);
std::string barf = source;
std::string const& result =
- mf->ExpandVariablesInString(barf, escapeQuotes, atOnly);
+ mf->ExpandVariablesInString(barf, escapeQuotes != 0, atOnly != 0);
return strdup(result.c_str());
}
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 594cb67..fc9c1d2 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -220,7 +220,7 @@ bool
cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
// Set permissions to writable
if (cmSystemTools::GetPermissions(fileName.c_str(), mode)) {
#if defined(_MSC_VER) || defined(__MINGW32__)
- writable = mode & S_IWRITE;
+ writable = (mode & S_IWRITE) != 0;
mode_t newMode = mode | S_IWRITE;
#else
writable = mode & S_IWUSR;
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx
b/Source/cmVisualStudioGeneratorOptions.cxx
index 5d67dcf..afe9230 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -269,7 +269,7 @@ void cmVisualStudioGeneratorOptions::FixManifestUACFlags()
if (keyValue[1].front() == '\'' && keyValue[1].back() == '\'') {
keyValue[1] =
- keyValue[1].substr(1, std::max<int>(0, keyValue[1].size() - 2));
+ keyValue[1].substr(1, std::max(0, cm::isize(keyValue[1]) - 2));
}
if (keyValue[0] == "level") {
diff --git a/Source/cmWriteFileCommand.cxx b/Source/cmWriteFileCommand.cxx
index c504ef4..49dbf1a 100644
--- a/Source/cmWriteFileCommand.cxx
+++ b/Source/cmWriteFileCommand.cxx
@@ -50,7 +50,7 @@ bool cmWriteFileCommand::InitialPass(std::vector<std::string>
const& args,
// Set permissions to writable
if (cmSystemTools::GetPermissions(fileName.c_str(), mode)) {
#if defined(_MSC_VER) || defined(__MINGW32__)
- writable = mode & S_IWRITE;
+ writable = (mode & S_IWRITE) != 0;
mode_t newMode = mode | S_IWRITE;
#else
writable = mode & S_IWUSR;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70e245f19ec8e753784db6a1153c64e5f5eec16a
commit 70e245f19ec8e753784db6a1153c64e5f5eec16a
Author: Bruno Manganelli <bruno.mang...@gmail.com>
AuthorDate: Mon Dec 24 20:52:58 2018 +0000
Commit: Bruno Manganelli <bruno.mang...@gmail.com>
CommitDate: Thu Dec 27 22:29:06 2018 +0100
cmAlgorithms: add utility functions to get signed size of containers
diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index bbd3e8e..2f8e675 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -396,6 +396,12 @@ constexpr
#endif
+template <typename T>
+int isize(const T& t)
+{
+ return static_cast<int>(cm::size(t));
+}
+
#if __cplusplus >= 201402L || defined(_MSVC_LANG) && _MSVC_LANG >= 201402L
using std::cbegin;
-----------------------------------------------------------------------
Summary of changes:
Source/cmAlgorithms.h | 6 ++++++
Source/cmCPluginAPI.cxx | 2 +-
Source/cmFileCommand.cxx | 2 +-
Source/cmVisualStudioGeneratorOptions.cxx | 2 +-
Source/cmWriteFileCommand.cxx | 2 +-
Utilities/Sphinx/colors.py | 10 +++++-----
6 files changed, 15 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
