[Cmake-commits] CMake branch, next, updated. v3.3.0-2100-gfef2009

[Stephen Kelly]

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  fef2009bd53ee5089d51ff253d603097a9dfebab (commit)
       via  29886ce76482a8c857841015b58d1e91a9ee5c8e (commit)
      from  67df5c9aeee85453af8e53562b97f21dd4a40c55 (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=fef2009bd53ee5089d51ff253d603097a9dfebab
commit fef2009bd53ee5089d51ff253d603097a9dfebab
Merge: 67df5c9 29886ce
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 7 15:55:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 7 15:55:28 2015 -0400

    Merge topic 'use-generator-target' into next
    
    29886ce7 cmTarget: Use a simpler delete algorithm.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29886ce76482a8c857841015b58d1e91a9ee5c8e
commit 29886ce76482a8c857841015b58d1e91a9ee5c8e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 4 23:16:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 7 21:55:17 2015 +0200

    cmTarget: Use a simpler delete algorithm.
    
    This way, the methods can be moved without requiring a local algorithm.
    
    The containers use automatic storage.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1277fc2..d3170e4 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -191,14 +191,6 @@ public:
 cmLinkImplItem cmTargetInternals::TargetPropertyEntry::NoLinkImplItem;
 
 //----------------------------------------------------------------------------
-static void deleteAndClear(
-      std::vector<cmTargetInternals::TargetPropertyEntry*> &entries)
-{
-  cmDeleteAll(entries);
-  entries.clear();
-}
-
-//----------------------------------------------------------------------------
 cmTargetInternals::~cmTargetInternals()
 {
 }
@@ -810,7 +802,7 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
     this->LinkImplementationLanguageIsContextDependent = false;
     }
 
-  deleteAndClear(linkInterfaceSourcesEntries);
+  cmDeleteAll(linkInterfaceSourcesEntries);
 }
 
 //----------------------------------------------------------------------------
@@ -2172,7 +2164,7 @@ cmTarget::GetIncludeDirectories(const std::string& config,
                             debugIncludes,
                             language);
 
-  deleteAndClear(linkInterfaceIncludeDirectoriesEntries);
+  cmDeleteAll(linkInterfaceIncludeDirectoriesEntries);
 
   return includes;
 }
@@ -2293,7 +2285,7 @@ void cmTarget::GetCompileOptions(std::vector<std::string> &result,
                             debugOptions,
                             language);
 
-  deleteAndClear(linkInterfaceCompileOptionsEntries);
+  cmDeleteAll(linkInterfaceCompileOptionsEntries);
 }
 
 //----------------------------------------------------------------------------
@@ -2395,7 +2387,7 @@ void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
                             debugDefines,
                             language);
 
-  deleteAndClear(linkInterfaceCompileDefinitionsEntries);
+  cmDeleteAll(linkInterfaceCompileDefinitionsEntries);
 }
 
 //----------------------------------------------------------------------------
@@ -2462,7 +2454,7 @@ void cmTarget::GetCompileFeatures(std::vector<std::string> &result,
                             config,
                             debugFeatures);
 
-  deleteAndClear(linkInterfaceCompileFeaturesEntries);
+  cmDeleteAll(linkInterfaceCompileFeaturesEntries);
 }
 
 //----------------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake