summaryrefslogtreecommitdiff
path: root/Source/cmGlobalJOMMakefileGenerator.h
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 10:34:04 -0400
committerBrad King <brad.king@kitware.com>2016-05-16 16:05:19 -0400
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmGlobalJOMMakefileGenerator.h
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadcmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
Diffstat (limited to 'Source/cmGlobalJOMMakefileGenerator.h')
-rw-r--r--Source/cmGlobalJOMMakefileGenerator.h20
1 files changed, 12 insertions, 8 deletions
diff --git a/Source/cmGlobalJOMMakefileGenerator.h b/Source/cmGlobalJOMMakefileGenerator.h
index 1869fed79b..bb2273abf6 100644
--- a/Source/cmGlobalJOMMakefileGenerator.h
+++ b/Source/cmGlobalJOMMakefileGenerator.h
@@ -23,15 +23,18 @@ class cmGlobalJOMMakefileGenerator : public cmGlobalUnixMakefileGenerator3
{
public:
cmGlobalJOMMakefileGenerator(cmake* cm);
- static cmGlobalGeneratorFactory* NewFactory() {
- return new cmGlobalGeneratorSimpleFactory
- <cmGlobalJOMMakefileGenerator>(); }
+ static cmGlobalGeneratorFactory* NewFactory()
+ {
+ return new cmGlobalGeneratorSimpleFactory<cmGlobalJOMMakefileGenerator>();
+ }
///! Get the name for the generator.
- virtual std::string GetName() const {
- return cmGlobalJOMMakefileGenerator::GetActualName();}
+ virtual std::string GetName() const
+ {
+ return cmGlobalJOMMakefileGenerator::GetActualName();
+ }
// use NMake Makefiles in the name so that scripts/tests that depend on the
// name NMake Makefiles will work
- static std::string GetActualName() {return "NMake Makefiles JOM";}
+ static std::string GetActualName() { return "NMake Makefiles JOM"; }
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);
@@ -40,8 +43,9 @@ public:
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
- virtual void EnableLanguage(std::vector<std::string>const& languages,
- cmMakefile *, bool optional);
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
+
private:
void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
const char* envVar) const;