diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-04-03 19:28:10 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-04-03 19:53:13 (GMT) |
| commit | 4bef02e7aa60c48df923d778ae33438e573ec7bc (patch) | |
| tree | 75ca33190733919d9e5d7431820bb97c3604f25e /Source/CPack/cmCPackGenerator.h | |
| parent | ff710539ab31ba4b6f3b376621dd9fbd56e1b558 (diff) | |
| download | CMake-4bef02e7aa60c48df923d778ae33438e573ec7bc.zip CMake-4bef02e7aa60c48df923d778ae33438e573ec7bc.tar.gz CMake-4bef02e7aa60c48df923d778ae33438e573ec7bc.tar.bz2 | |
cmTypeMacro: Add a class to eat the semicolon following the macro use.
Apply the same workaround to the cmCPackTypeMacro. Additionally
change that macro to not use 'class' as a macro parameter.
Diffstat (limited to 'Source/CPack/cmCPackGenerator.h')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h index efd3bef..e780f0e 100644 --- a/Source/CPack/cmCPackGenerator.h +++ b/Source/CPack/cmCPackGenerator.h @@ -22,9 +22,10 @@ // Forward declarations are insufficient since we use them in // std::map data members below... -#define cmCPackTypeMacro(class, superclass) \ - cmTypeMacro(class, superclass); \ - static cmCPackGenerator* CreateGenerator() { return new class; } +#define cmCPackTypeMacro(klass, superclass) \ + cmTypeMacro(klass, superclass); \ + static cmCPackGenerator* CreateGenerator() { return new klass; } \ + class cmCPackTypeMacro_UseTrailingSemicolon #define cmCPackLogger(logType, msg) \ do { \ |