From 2214011f7b3b13fe7ae0f68f0f9d49af11e12edd Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Sun, 23 Oct 2016 01:12:26 +0200 Subject: Make cmCPackGenerator not inherit from cmObject --- Source/CPack/cmCPackArchiveGenerator.h | 2 +- Source/CPack/cmCPackGenerator.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/CPack/cmCPackArchiveGenerator.h b/Source/CPack/cmCPackArchiveGenerator.h index e960a6a..7010664 100644 --- a/Source/CPack/cmCPackArchiveGenerator.h +++ b/Source/CPack/cmCPackArchiveGenerator.h @@ -23,7 +23,7 @@ class cmCPackComponent; class cmCPackArchiveGenerator : public cmCPackGenerator { public: - cmTypeMacro(cmCPackArchiveGenerator, cmCPackGenerator); + typedef cmCPackGenerator Superclass; /** * Construct generator diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h index db20998..a7652b1 100644 --- a/Source/CPack/cmCPackGenerator.h +++ b/Source/CPack/cmCPackGenerator.h @@ -20,7 +20,8 @@ class cmInstalledFile; class cmMakefile; #define cmCPackTypeMacro(klass, superclass) \ - cmTypeMacro(klass, superclass); \ + typedef superclass Superclass; \ + const char* GetNameOfClass() CM_OVERRIDE { return #klass; } \ static cmCPackGenerator* CreateGenerator() { return new klass; } \ class cmCPackTypeMacro_UseTrailingSemicolon @@ -36,10 +37,10 @@ class cmMakefile; * \brief A superclass of all CPack Generators * */ -class cmCPackGenerator : public cmObject +class cmCPackGenerator { public: - cmTypeMacro(cmCPackGenerator, cmObject); + virtual const char* GetNameOfClass() = 0; /** * If verbose then more information is printed out */ @@ -83,7 +84,7 @@ public: * Construct generator */ cmCPackGenerator(); - ~cmCPackGenerator() CM_OVERRIDE; + virtual ~cmCPackGenerator(); //! Set and get the options void SetOption(const std::string& op, const char* value); -- cgit v0.12