Merge topic 'clang-format-source'

d9fd2f54 Revise C++ coding style using clang-format
82df6dea Empty commit at end of history preceding clang-format style transition
6a13f43f CONTRIBUTING: Add a section on coding style
bf451d9f Add a script to run clang-format on the entire source tree
1e90d78f Configure clang-format for CMake source tree
da60adc3 Tell Git to use a distinct conflict marker size in `.rst` files

1 files changed, 13 insertions, 17 deletions

diff --git a/Source/cmMathCommand.cxx b/Source/cmMathCommand.cxx
index d6e1d17..ca8b926 100644
--- a/Source/cmMathCommand.cxx
+++ b/Source/cmMathCommand.cxx
@@ -13,43 +13,39 @@
 
 #include "cmExprParserHelper.h"
 
-bool cmMathCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmMathCommand::InitialPass(std::vector<std::string> const& args,
+                                cmExecutionStatus&)
 {
-  if ( args.size() < 1 )
-    {
+  if (args.size() < 1) {
     this->SetError("must be called with at least one argument.");
     return false;
-    }
-  const std::string &subCommand = args[0];
-  if(subCommand == "EXPR")
-    {
+  }
+  const std::string& subCommand = args[0];
+  if (subCommand == "EXPR") {
     return this->HandleExprCommand(args);
-    }
-  std::string e = "does not recognize sub-command "+subCommand;
+  }
+  std::string e = "does not recognize sub-command " + subCommand;
   this->SetError(e);
   return false;
 }
 
 bool cmMathCommand::HandleExprCommand(std::vector<std::string> const& args)
 {
-  if ( args.size() != 3 )
-    {
+  if (args.size() != 3) {
     this->SetError("EXPR called with incorrect arguments.");
     return false;
-    }
+  }
 
   const std::string& outputVariable = args[1];
   const std::string& expression = args[2];
 
   cmExprParserHelper helper;
-  if ( !helper.ParseString(expression.c_str(), 0) )
-    {
-    std::string e = "cannot parse the expression: \""+expression+"\": ";
+  if (!helper.ParseString(expression.c_str(), 0)) {
+    std::string e = "cannot parse the expression: \"" + expression + "\": ";
     e += helper.GetError();
     this->SetError(e);
     return false;
-    }
+  }
 
   char buffer[1024];
   sprintf(buffer, "%d", helper.GetResult());