[Cmake-commits] CMake branch, next, updated. v3.3.1-2413-g6c485ea
Stephen Kelly
steveire at gmail.com
Mon Aug 24 14:41:27 EDT 2015
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 6c485ea8009341d0c746ed3bac3c5d31e6bcea7f (commit)
via 0138a0e9116567f5e9c45e36d657d01e3953e6fe (commit)
via 9faef0000924a39cb82f54bb91a9ca734a4c8643 (commit)
from 536fc37c4505057b3ba2b0d79a28828c47b42a22 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c485ea8009341d0c746ed3bac3c5d31e6bcea7f
commit 6c485ea8009341d0c746ed3bac3c5d31e6bcea7f
Merge: 536fc37 0138a0e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 24 14:41:26 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 24 14:41:26 2015 -0400
Merge topic 'cmState-definitions' into next
0138a0e9 Revert "cmLinkedTree: Add API for size query and reserve."
9faef000 Revert "cmState: Reserve the number of cmLinkedTree nodes if known."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0138a0e9116567f5e9c45e36d657d01e3953e6fe
commit 0138a0e9116567f5e9c45e36d657d01e3953e6fe
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 24 20:40:54 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 24 20:40:54 2015 +0200
Revert "cmLinkedTree: Add API for size query and reserve."
This reverts commit d7fc7c3a403170035359e8e3b173725a04b6c1ff.
diff --git a/Source/cmLinkedTree.h b/Source/cmLinkedTree.h
index 385dff2..3bcb940 100644
--- a/Source/cmLinkedTree.h
+++ b/Source/cmLinkedTree.h
@@ -161,17 +161,6 @@ public:
this->Data.clear();
}
- size_t Size() const
- {
- return this->UpPositions.size();
- }
-
- void Reserve(size_t amount)
- {
- this->UpPositions.reserve(amount);
- this->Data.reserve(amount);
- }
-
private:
T& GetReference(PositionType pos)
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9faef0000924a39cb82f54bb91a9ca734a4c8643
commit 9faef0000924a39cb82f54bb91a9ca734a4c8643
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 24 20:40:50 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 24 20:40:50 2015 +0200
Revert "cmState: Reserve the number of cmLinkedTree nodes if known."
This reverts commit eb47176870eedef7af8b53d98887d4326cb509de.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a19a074..cda26cd 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1141,42 +1141,6 @@ void cmGlobalGenerator::Configure()
this->BinaryDirectories.insert(
this->CMakeInstance->GetHomeOutputDirectory());
- if (const char *numStr =
- this->GetCMakeInstance()->GetState()
- ->GetInitializedCacheValue("CMAKE_NUMBER_OF_DEFINITION_STATES"))
- {
- int num = atoi(numStr);
- this->GetCMakeInstance()->GetState()->ReserveDefinitions(num);
- }
- if (const char *numStr =
- this->GetCMakeInstance()->GetState()
- ->GetInitializedCacheValue("CMAKE_NUMBER_OF_SNAPSHOT_STATES"))
- {
- int num = atoi(numStr);
- this->GetCMakeInstance()->GetState()->ReserveSnapshots(num);
- }
- if (const char *numStr =
- this->GetCMakeInstance()->GetState()
- ->GetInitializedCacheValue("CMAKE_NUMBER_OF_LISTFILE_STATES"))
- {
- int num = atoi(numStr);
- this->GetCMakeInstance()->GetState()->ReserveListFiles(num);
- }
- if (const char *numStr =
- this->GetCMakeInstance()->GetState()
- ->GetInitializedCacheValue("CMAKE_NUMBER_OF_LOCAL_GENERATORS"))
- {
- int num = atoi(numStr);
- this->GetCMakeInstance()->GetState()->ReserveDirectories(num);
- }
- if (const char *numStr =
- this->GetCMakeInstance()->GetState()
- ->GetInitializedCacheValue("CMAKE_NUMBER_OF_POLICY_STATES"))
- {
- int num = atoi(numStr);
- this->GetCMakeInstance()->GetState()->ReservePolicies(num);
- }
-
// now do it
lg->GetMakefile()->Configure();
lg->GetMakefile()->EnforceDirectoryLevelRules();
@@ -1189,35 +1153,6 @@ void cmGlobalGenerator::Configure()
("CMAKE_NUMBER_OF_MAKEFILES", num,
"number of local generators", cmState::INTERNAL);
- {
- std::ostringstream str;
- str << this->GetCMakeInstance()->GetState()->DefinitionsSize();
- this->GetCMakeInstance()->AddCacheEntry
- ("CMAKE_NUMBER_OF_DEFINITION_STATES", str.str().c_str(),
- "number of definition states", cmState::INTERNAL);
- }
- {
- std::ostringstream str;
- str << this->GetCMakeInstance()->GetState()->SnapshotsSize();
- this->GetCMakeInstance()->AddCacheEntry
- ("CMAKE_NUMBER_OF_SNAPSHOT_STATES", str.str().c_str(),
- "number of snapshot states", cmState::INTERNAL);
- }
- {
- std::ostringstream str;
- str << this->GetCMakeInstance()->GetState()->ListFilesSize();
- this->GetCMakeInstance()->AddCacheEntry
- ("CMAKE_NUMBER_OF_LISTFILE_STATES", str.str().c_str(),
- "number of listfile states", cmState::INTERNAL);
- }
- {
- std::ostringstream str;
- str << this->GetCMakeInstance()->GetState()->PoliciesSize();
- this->GetCMakeInstance()->AddCacheEntry
- ("CMAKE_NUMBER_OF_POLICY_STATES", str.str().c_str(),
- "number of policy states", cmState::INTERNAL);
- }
-
// check for link libraries and include directories containing "NOTFOUND"
// and for infinite loops
this->CheckLocalGenerators();
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 99a7537..ab309ad 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -651,56 +651,6 @@ bool cmState::UseMSYSShell() const
return this->MSYSShell;
}
-size_t cmState::DefinitionsSize() const
-{
- return this->VarTree.Size();
-}
-
-void cmState::ReserveDefinitions(size_t amount)
-{
- this->VarTree.Reserve(amount);
-}
-
-size_t cmState::SnapshotsSize() const
-{
- return this->SnapshotData.Size();
-}
-
-void cmState::ReserveSnapshots(size_t amount)
-{
- this->SnapshotData.Reserve(amount);
-}
-
-size_t cmState::ListFilesSize() const
-{
- return this->ExecutionListFiles.Size();
-}
-
-void cmState::ReserveListFiles(size_t amount)
-{
- this->ExecutionListFiles.Reserve(amount);
-}
-
-size_t cmState::DirectoriesSize() const
-{
- return this->BuildsystemDirectory.Size();
-}
-
-void cmState::ReserveDirectories(size_t amount)
-{
- this->BuildsystemDirectory.Reserve(amount);
-}
-
-size_t cmState::PoliciesSize() const
-{
- return this->PolicyStack.Size();
-}
-
-void cmState::ReservePolicies(size_t amount)
-{
- this->PolicyStack.Reserve(amount);
-}
-
const char* cmState::GetBinaryDirectory() const
{
return this->BinaryDirectory.c_str();
diff --git a/Source/cmState.h b/Source/cmState.h
index 8380587..5499665 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -270,21 +270,6 @@ public:
void SetMSYSShell(bool mSYSShell);
bool UseMSYSShell() const;
- size_t DefinitionsSize() const;
- void ReserveDefinitions(size_t amount);
-
- size_t SnapshotsSize() const;
- void ReserveSnapshots(size_t amount);
-
- size_t ListFilesSize() const;
- void ReserveListFiles(size_t amount);
-
- size_t DirectoriesSize() const;
- void ReserveDirectories(size_t amount);
-
- size_t PoliciesSize() const;
- void ReservePolicies(size_t amount);
-
private:
std::map<cmProperty::ScopeType, cmPropertyDefinitionMap> PropertyDefinitions;
std::vector<std::string> EnabledLanguages;
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 65 ------------------------------------------
Source/cmLinkedTree.h | 11 -------
Source/cmState.cxx | 50 --------------------------------
Source/cmState.h | 15 ----------
4 files changed, 141 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list