[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-235-ged95d2c

[Daniel Pfeifer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ed95d2c9aed1241d30c45a32fce775a8977cba77 (commit)
       via  757b0ff5dd08445ebac4f7ea50dd143a67f2e966 (commit)
      from  d6df33e4f52f1cc2302df0a6ebdfdfb45cea3d9a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed95d2c9aed1241d30c45a32fce775a8977cba77
commit ed95d2c9aed1241d30c45a32fce775a8977cba77
Merge: d6df33e 757b0ff
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sat Jun 11 03:49:32 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 11 03:49:32 2016 -0400

    Merge topic 'add-braces' into next
    
    757b0ff5 Add missing braces around statements in header files


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=757b0ff5dd08445ebac4f7ea50dd143a67f2e966
commit 757b0ff5dd08445ebac4f7ea50dd143a67f2e966
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sat Jun 11 09:49:00 2016 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Sat Jun 11 09:49:00 2016 +0200

    Add missing braces around statements in header files

diff --git a/Source/cmGlobalGeneratorFactory.h b/Source/cmGlobalGeneratorFactory.h
index 640497a..7d4fe2c 100644
--- a/Source/cmGlobalGeneratorFactory.h
+++ b/Source/cmGlobalGeneratorFactory.h
@@ -51,8 +51,9 @@ public:
   virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
                                                    cmake* cm) const
   {
-    if (name != T::GetActualName())
+    if (name != T::GetActualName()) {
       return 0;
+    }
     return new T(cm);
   }
 
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index c665b1f..a078362 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -643,8 +643,9 @@ public:
 
   void AddInstallGenerator(cmInstallGenerator* g)
   {
-    if (g)
+    if (g) {
       this->InstallGenerators.push_back(g);
+    }
   }
   std::vector<cmInstallGenerator*>& GetInstallGenerators()
   {
@@ -653,8 +654,9 @@ public:
 
   void AddTestGenerator(cmTestGenerator* g)
   {
-    if (g)
+    if (g) {
       this->TestGenerators.push_back(g);
+    }
   }
   const std::vector<cmTestGenerator*>& GetTestGenerators() const
   {
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 6669e5c..d3bf301 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -75,17 +75,21 @@ struct cmDocumentationEntry
   cmDocumentationEntry() {}
   cmDocumentationEntry(const char* doc[2])
   {
-    if (doc[0])
+    if (doc[0]) {
       this->Name = doc[0];
-    if (doc[1])
+    }
+    if (doc[1]) {
       this->Brief = doc[1];
+    }
   }
   cmDocumentationEntry(const char* n, const char* b)
   {
-    if (n)
+    if (n) {
       this->Name = n;
-    if (b)
+    }
+    if (b) {
       this->Brief = b;
+    }
   }
 };
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGeneratorFactory.h |    3 ++-
 Source/cmMakefile.h               |    6 ++++--
 Source/cmStandardIncludes.h       |   12 ++++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake