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 d8f0bd69fa5a7ebcfcc79f07378778f3568f005e (commit)
via 1fc8df9ca22c23f42afa94a949918cda008b07ce (commit)
via 7a3ecf5ed5eb12d39f4fb14c821efda0b6a64031 (commit)
from 6fbf0a7aad1fffaa02948e9a53d95d584d0ad909 (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=d8f0bd69fa5a7ebcfcc79f07378778f3568f005e
commit d8f0bd69fa5a7ebcfcc79f07378778f3568f005e
Merge: 6fbf0a7 1fc8df9
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jul 22 09:37:35 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 22 09:37:35 2012 -0400
Merge topic 'ninja-fix-macosx' into next
1fc8df9 Add missing this->.
7a3ecf5 Fix memory leak in Makefile generator.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fc8df9ca22c23f42afa94a949918cda008b07ce
commit 1fc8df9ca22c23f42afa94a949918cda008b07ce
Author: Nicolas Despres <nicolas.despres at gmail.com>
AuthorDate: Sat Jul 21 19:52:17 2012 +0200
Commit: Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sun Jul 22 15:36:35 2012 +0200
Add missing this->.
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 967507e..3e4415a 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -73,7 +73,7 @@ cmNinjaTargetGenerator::cmNinjaTargetGenerator(cmTarget* target)
cmNinjaTargetGenerator::~cmNinjaTargetGenerator()
{
- delete MacOSXContentGenerator;
+ delete this->MacOSXContentGenerator;
}
cmGeneratedFileStream& cmNinjaTargetGenerator::GetBuildFileStream() const
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a3ecf5ed5eb12d39f4fb14c821efda0b6a64031
commit 7a3ecf5ed5eb12d39f4fb14c821efda0b6a64031
Author: Nicolas Despres <nicolas.despres at gmail.com>
AuthorDate: Sat Jul 21 19:51:55 2012 +0200
Commit: Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sun Jul 22 15:36:05 2012 +0200
Fix memory leak in Makefile generator.
This was introduced by 5d885db416a.
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index e8afd45..4456aa7 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -33,6 +33,13 @@ cmMakefileUtilityTargetGenerator
}
//----------------------------------------------------------------------------
+cmMakefileUtilityTargetGenerator
+::~cmMakefileUtilityTargetGenerator()
+{
+ delete this->OSXBundleGenerator;
+}
+
+//----------------------------------------------------------------------------
void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
{
this->CreateRuleFile();
diff --git a/Source/cmMakefileUtilityTargetGenerator.h b/Source/cmMakefileUtilityTargetGenerator.h
index 99c16fc..fc47b38 100644
--- a/Source/cmMakefileUtilityTargetGenerator.h
+++ b/Source/cmMakefileUtilityTargetGenerator.h
@@ -14,16 +14,17 @@
#include "cmMakefileTargetGenerator.h"
-class cmMakefileUtilityTargetGenerator:
+class cmMakefileUtilityTargetGenerator:
public cmMakefileTargetGenerator
{
public:
cmMakefileUtilityTargetGenerator(cmTarget* target);
+ virtual ~cmMakefileUtilityTargetGenerator();
/* the main entry point for this class. Writes the Makefiles associated
with this target */
- virtual void WriteRuleFiles();
-
+ virtual void WriteRuleFiles();
+
protected:
};
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefileUtilityTargetGenerator.cxx | 7 +++++++
Source/cmMakefileUtilityTargetGenerator.h | 7 ++++---
Source/cmNinjaTargetGenerator.cxx | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake