[Cmake-commits] CMake branch, master, updated. v3.13.2-799-gf789441
Kitware Robot
kwrobot at kitware.com
Fri Jan 4 16:53:05 EST 2019
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 f789441179fb4bc8df01d6a5ec6c235553164d3e (commit)
via aaf7c94ddb9d906baff34141e65623e2bee98020 (commit)
via 77d83568e0aa96c34520b78e3671aa0d140a158e (commit)
via 1b135cdff26e36fdd846edd2625e7edd7943b0b4 (commit)
from e7a88ce48243b953c4234692726c7f663212e5cd (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=f789441179fb4bc8df01d6a5ec6c235553164d3e
commit f789441179fb4bc8df01d6a5ec6c235553164d3e
Merge: aaf7c94 1b135cd
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Fri Jan 4 21:48:59 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jan 4 16:49:07 2019 -0500
Merge topic 'remove-std-iterator'
1b135cdff2 cmLinkedTree: Remove deprecated std::iterator
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2767
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaf7c94ddb9d906baff34141e65623e2bee98020
commit aaf7c94ddb9d906baff34141e65623e2bee98020
Merge: e7a88ce 77d8356
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Fri Jan 4 21:46:38 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jan 4 16:47:01 2019 -0500
Merge topic 'get-ide-version-const'
77d83568e0 cmGlobalVisualStudioGenerator::GetIDEVersion(): const added
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2769
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77d83568e0aa96c34520b78e3671aa0d140a158e
commit 77d83568e0aa96c34520b78e3671aa0d140a158e
Author: Vitaly Stakhovsky <vvs31415 at gitlab.org>
AuthorDate: Wed Jan 2 08:25:49 2019 -0500
Commit: Vitaly Stakhovsky <vvs31415 at gitlab.org>
CommitDate: Wed Jan 2 08:25:49 2019 -0500
cmGlobalVisualStudioGenerator::GetIDEVersion(): const added
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 15244ac..dc49ded 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -140,7 +140,7 @@ protected:
virtual bool SelectWindowsPhoneToolset(std::string& toolset) const;
virtual bool SelectWindowsStoreToolset(std::string& toolset) const;
- const char* GetIDEVersion() override { return "10.0"; }
+ const char* GetIDEVersion() const override { return "10.0"; }
std::string const& GetMSBuildCommand();
diff --git a/Source/cmGlobalVisualStudio11Generator.h b/Source/cmGlobalVisualStudio11Generator.h
index 624bf36..5b089a4 100644
--- a/Source/cmGlobalVisualStudio11Generator.h
+++ b/Source/cmGlobalVisualStudio11Generator.h
@@ -43,7 +43,7 @@ protected:
bool IsWindowsPhoneToolsetInstalled() const;
bool IsWindowsStoreToolsetInstalled() const;
- const char* GetIDEVersion() override { return "11.0"; }
+ const char* GetIDEVersion() const override { return "11.0"; }
bool UseFolderProperty() const override;
static std::set<std::string> GetInstalledWindowsCESDKs();
diff --git a/Source/cmGlobalVisualStudio12Generator.h b/Source/cmGlobalVisualStudio12Generator.h
index 9d6554a..ae78de7 100644
--- a/Source/cmGlobalVisualStudio12Generator.h
+++ b/Source/cmGlobalVisualStudio12Generator.h
@@ -48,7 +48,7 @@ protected:
// of the toolset is installed
bool IsWindowsPhoneToolsetInstalled() const;
bool IsWindowsStoreToolsetInstalled() const;
- const char* GetIDEVersion() override { return "12.0"; }
+ const char* GetIDEVersion() const override { return "12.0"; }
private:
class Factory;
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h
index 9f5bb4e..4bc430b 100644
--- a/Source/cmGlobalVisualStudio14Generator.h
+++ b/Source/cmGlobalVisualStudio14Generator.h
@@ -41,7 +41,7 @@ protected:
// version of the toolset.
virtual std::string GetWindows10SDKMaxVersion() const;
- const char* GetIDEVersion() override { return "14.0"; }
+ const char* GetIDEVersion() const override { return "14.0"; }
virtual bool SelectWindows10SDK(cmMakefile* mf, bool required);
// Used to verify that the Desktop toolset for the current generator is
diff --git a/Source/cmGlobalVisualStudio15Generator.h b/Source/cmGlobalVisualStudio15Generator.h
index 8ab63f1..68aa14f 100644
--- a/Source/cmGlobalVisualStudio15Generator.h
+++ b/Source/cmGlobalVisualStudio15Generator.h
@@ -39,7 +39,7 @@ protected:
bool InitializeWindows(cmMakefile* mf) override;
bool SelectWindowsStoreToolset(std::string& toolset) const override;
- const char* GetIDEVersion() override { return "15.0"; }
+ const char* GetIDEVersion() const override { return "15.0"; }
// Used to verify that the Desktop toolset for the current generator is
// installed on the machine.
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 59e7a98..12a86f2 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -111,7 +111,6 @@ public:
protected:
void Generate() override;
- virtual const char* GetIDEVersion() = 0;
std::string const& GetDevEnvCommand();
virtual std::string FindDevEnvCommand();
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index a431cc1..a21c53d 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -49,7 +49,7 @@ public:
protected:
void AddExtraIDETargets() override;
- const char* GetIDEVersion() override { return "8.0"; }
+ const char* GetIDEVersion() const override { return "8.0"; }
std::string FindDevEnvCommand() override;
diff --git a/Source/cmGlobalVisualStudio9Generator.h b/Source/cmGlobalVisualStudio9Generator.h
index 2aa6a91..ee17c37 100644
--- a/Source/cmGlobalVisualStudio9Generator.h
+++ b/Source/cmGlobalVisualStudio9Generator.h
@@ -37,7 +37,7 @@ public:
std::string GetUserMacrosRegKeyBase() override;
protected:
- const char* GetIDEVersion() override { return "9.0"; }
+ const char* GetIDEVersion() const override { return "9.0"; }
private:
class Factory;
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 4a7705d..c891160 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -137,7 +137,7 @@ protected:
// below 8.
virtual bool VSLinksDependencies() const { return true; }
- virtual const char* GetIDEVersion() = 0;
+ virtual const char* GetIDEVersion() const = 0;
bool ComputeTargetDepends() override;
class VSDependSet : public std::set<std::string>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b135cdff26e36fdd846edd2625e7edd7943b0b4
commit 1b135cdff26e36fdd846edd2625e7edd7943b0b4
Author: Vitaly Stakhovsky <vvs31415 at gitlab.org>
AuthorDate: Sun Dec 30 15:55:14 2018 -0500
Commit: Vitaly Stakhovsky <vvs31415 at gitlab.org>
CommitDate: Tue Jan 1 16:51:50 2019 -0500
cmLinkedTree: Remove deprecated std::iterator
diff --git a/Source/cmLinkedTree.h b/Source/cmLinkedTree.h
index 975f052..099fb6d 100644
--- a/Source/cmLinkedTree.h
+++ b/Source/cmLinkedTree.h
@@ -6,7 +6,6 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include <assert.h>
-#include <iterator>
#include <vector>
/**
@@ -33,7 +32,7 @@ class cmLinkedTree
typedef T& ReferenceType;
public:
- class iterator : public std::iterator<std::forward_iterator_tag, T>
+ class iterator
{
friend class cmLinkedTree;
cmLinkedTree* Tree;
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio10Generator.h | 2 +-
Source/cmGlobalVisualStudio11Generator.h | 2 +-
Source/cmGlobalVisualStudio12Generator.h | 2 +-
Source/cmGlobalVisualStudio14Generator.h | 2 +-
Source/cmGlobalVisualStudio15Generator.h | 2 +-
Source/cmGlobalVisualStudio7Generator.h | 1 -
Source/cmGlobalVisualStudio8Generator.h | 2 +-
Source/cmGlobalVisualStudio9Generator.h | 2 +-
Source/cmGlobalVisualStudioGenerator.h | 2 +-
Source/cmLinkedTree.h | 3 +--
10 files changed, 9 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list