Ninja: remove warnings

1 files changed, 7 insertions, 6 deletions

diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index a2ca4bd8ca..fb45837461 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;