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 9b8ba31802a3e89b8aa1f34b3dfa7521d47c235a (commit)
via 6e977a761af4f38ad27dbdbc2e3777c780fb494e (commit)
from 4d0a5c05cec02e9b0ed8987621ae3a4f6a3b2428 (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=9b8ba31802a3e89b8aa1f34b3dfa7521d47c235a
commit 9b8ba31802a3e89b8aa1f34b3dfa7521d47c235a
Merge: 4d0a5c0 6e977a7
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 5 03:21:33 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 5 03:21:33 2015 -0500
Merge topic 'delete-algorithm' into next
6e977a76 Revert use of sfinae.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e977a761af4f38ad27dbdbc2e3777c780fb494e
commit 6e977a761af4f38ad27dbdbc2e3777c780fb494e
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 5 09:19:59 2015 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon Jan 5 09:20:11 2015 +0100
Revert use of sfinae.
VS 7.1 doesn't support sfinae.
diff --git a/Source/cmExportSetMap.cxx b/Source/cmExportSetMap.cxx
index 14c4458..5174118 100644
--- a/Source/cmExportSetMap.cxx
+++ b/Source/cmExportSetMap.cxx
@@ -25,7 +25,12 @@ cmExportSet* cmExportSetMap::operator[](const std::string
&name)
void cmExportSetMap::clear()
{
- cmDeleteAll(*this);
+ for(std::map<std::string, cmExportSet*>::iterator it = this->begin();
+ it != this->end();
+ ++ it)
+ {
+ delete it->second;
+ }
this->derived::clear();
}
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1549322..721c2ab 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1510,7 +1510,11 @@ void cmGlobalGenerator::CreateGeneratorTargets()
//----------------------------------------------------------------------------
void cmGlobalGenerator::ClearGeneratorMembers()
{
- cmDeleteAll(this->GeneratorTargets);
+ for(cmGeneratorTargetsType::iterator i = this->GeneratorTargets.begin();
+ i != this->GeneratorTargets.end(); ++i)
+ {
+ delete i->second;
+ }
this->GeneratorTargets.clear();
cmDeleteAll(this->EvaluationFiles);
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 4e846e6..853413d 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -448,22 +448,7 @@ private:
namespace ContainerAlgorithms {
-template<typename> struct voider { typedef void type; };
-
-template<typename T, typename = void>
-struct HasSecondType
-{
- enum { value = false };
-};
-
-template<typename T>
-struct HasSecondType<T, typename voider<typename T::second_type>::type>
-{
- enum { value = true };
-};
-
-template<typename Container,
- bool hasSecondType = HasSecondType<typename Container::value_type>::value>
+template<typename Container>
struct DefaultDeleter
{
void operator()(typename Container::value_type value) {
@@ -471,10 +456,10 @@ struct DefaultDeleter
}
};
-template<typename Container>
-struct DefaultDeleter<Container, /* hasSecondType = */ true>
+template<typename K, typename V>
+struct DefaultDeleter<std::map<K, V> >
{
- void operator()(typename Container::value_type value) {
+ void operator()(typename std::map<K, V>::value_type value) {
delete value.second;
}
};
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0eb47a9..3f09b9e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -542,7 +542,12 @@ void cmTarget::ClearLinkMaps()
this->Internal->LinkInterfaceMap.clear();
this->Internal->LinkInterfaceUsageRequirementsOnlyMap.clear();
this->Internal->LinkClosureMap.clear();
- cmDeleteAll(this->LinkInformation);
+ for (cmTargetLinkInformationMap::const_iterator it
+ = this->LinkInformation.begin();
+ it != this->LinkInformation.end(); ++it)
+ {
+ delete it->second;
+ }
this->LinkInformation.clear();
}
@@ -6908,7 +6913,10 @@ cmTargetLinkInformationMap
//----------------------------------------------------------------------------
cmTargetLinkInformationMap::~cmTargetLinkInformationMap()
{
- cmDeleteAll(*this);
+ for(derived::iterator i = this->begin(); i != this->end(); ++i)
+ {
+ delete i->second;
+ }
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportSetMap.cxx | 7 ++++++-
Source/cmGlobalGenerator.cxx | 6 +++++-
Source/cmStandardIncludes.h | 23 ++++-------------------
Source/cmTarget.cxx | 12 ++++++++++--
4 files changed, 25 insertions(+), 23 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
