[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2308-g3d6aace

[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  3d6aacedd3bb50f426984f9ed7f07fde2acbe1a7 (commit)
       via  c3f43a0350f30f382b6bcd56a82f9c72c6d7d04b (commit)
       via  71cbfff6d2958947758a0be17c86b398128b066d (commit)
      from  76669b0cc1b136abea07751203b0b5573ae45165 (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=3d6aacedd3bb50f426984f9ed7f07fde2acbe1a7
commit 3d6aacedd3bb50f426984f9ed7f07fde2acbe1a7
Merge: 76669b0 c3f43a0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 23 03:31:50 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 23 03:31:50 2013 -0500

    Merge topic 'memoize-link-iface-includes-defines' into next
    
    c3f43a0 Plug memory leak.
    71cbfff Remove unneeded use of nesting class.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3f43a0350f30f382b6bcd56a82f9c72c6d7d04b
commit c3f43a0350f30f382b6bcd56a82f9c72c6d7d04b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 23 09:21:11 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 23 09:29:22 2013 +0100

    Plug memory leak.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 003e76a..717cfc8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -92,6 +92,7 @@ public:
     // Others not copied here are result caches.
     this->SourceEntries = r.SourceEntries;
     }
+  ~cmTargetInternals();
   typedef cmTarget::SourceFileFlags SourceFileFlags;
   std::map<cmSourceFile const*, SourceFileFlags> SourceFlagsMap;
   bool SourceFileFlagsConstructed;
@@ -148,6 +149,26 @@ public:
 };
 
 //----------------------------------------------------------------------------
+void deleteAndClear(
+      std::vector<cmTargetInternals::IncludeDirectoriesEntry*> &entries)
+{
+  for (std::vector<cmTargetInternals::IncludeDirectoriesEntry*>::const_iterator
+      it = entries.begin(),
+      end = entries.end();
+      it != end; ++it)
+    {
+      delete *it;
+    }
+  entries.clear();
+}
+
+//----------------------------------------------------------------------------
+cmTargetInternals::~cmTargetInternals()
+{
+  deleteAndClear(CachedLinkInterfaceIncludeDirectoriesEntries);
+}
+
+//----------------------------------------------------------------------------
 cmTarget::cmTarget()
 {
   this->Makefile = 0;
@@ -2662,20 +2683,6 @@ void cmTarget::GatherDependencies( const cmMakefile& mf,
 }
 
 //----------------------------------------------------------------------------
-void deleteAndClear(
-      std::vector<cmTargetInternals::IncludeDirectoriesEntry*> &entries)
-{
-  for (std::vector<cmTargetInternals::IncludeDirectoriesEntry*>::const_iterator
-      it = entries.begin(),
-      end = entries.end();
-      it != end; ++it)
-    {
-      delete *it;
-    }
-  entries.clear();
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::SetProperty(const char* prop, const char* value)
 {
   if (!prop)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71cbfff6d2958947758a0be17c86b398128b066d
commit 71cbfff6d2958947758a0be17c86b398128b066d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 23 09:13:56 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 23 09:13:56 2013 +0100

    Remove unneeded use of nesting class.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 5788094..003e76a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -139,7 +139,7 @@ public:
   std::vector<IncludeDirectoriesEntry*> IncludeDirectoriesEntries;
   std::vector<cmValueWithOrigin> LinkInterfaceIncludeDirectoriesEntries;
 
-  std::vector<cmTargetInternals::IncludeDirectoriesEntry*>
+  std::vector<IncludeDirectoriesEntry*>
                                 CachedLinkInterfaceIncludeDirectoriesEntries;
   std::map<std::string, std::string> CachedLinkInterfaceCompileDefinitions;
 

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

Summary of changes:
 Source/cmTarget.cxx |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake