summaryrefslogtreecommitdiffstats
path: root/Source/cmNinjaTargetGenerator.h
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-07-18 10:17:39 (GMT)
committerPeter Kümmel <syntheticpp@gmx.net>2012-07-18 10:17:39 (GMT)
commit44ba4cfdb6471506db37634b032cf4fa3784f4f9 (patch)
treec9230caf53978d4623932957c5d198645718e4ed /Source/cmNinjaTargetGenerator.h
parent7751966297e3b68b6c9904300f96bb57882af11a (diff)
downloadCMake-44ba4cfdb6471506db37634b032cf4fa3784f4f9.zip
CMake-44ba4cfdb6471506db37634b032cf4fa3784f4f9.tar.gz
CMake-44ba4cfdb6471506db37634b032cf4fa3784f4f9.tar.bz2
Ninja: remove warnings
Diffstat (limited to 'Source/cmNinjaTargetGenerator.h')
-rw-r--r--Source/cmNinjaTargetGenerator.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index a2ca4bd..fb45837 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -116,12 +116,13 @@ protected:
void EnsureParentDirectoryExists(const std::string& path);
// write rules for Mac OS X Application Bundle content.
- class MacOSXContentGeneratorType
- : public cmOSXBundleGenerator::MacOSXContentGeneratorType
+ struct MacOSXContentGeneratorType :
+ cmOSXBundleGenerator::MacOSXContentGeneratorType
{
- public:
- MacOSXContentGeneratorType(cmNinjaTargetGenerator* Generator);
- virtual void operator()(cmSourceFile& source, const char* pkgloc);
+ MacOSXContentGeneratorType(cmNinjaTargetGenerator* g) :
+ Generator(g) {}
+
+ void operator()(cmSourceFile& source, const char* pkgloc);
private:
cmNinjaTargetGenerator* Generator;
@@ -129,7 +130,7 @@ protected:
protected:
- MacOSXContentGeneratorType MacOSXContentGenerator;
+ MacOSXContentGeneratorType* MacOSXContentGenerator;
// Properly initialized by sub-classes.
cmOSXBundleGenerator* OSXBundleGenerator;
std::set<cmStdString> MacContentFolders;