diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmUseMangledMesaCommand.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
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/cmUseMangledMesaCommand.cxx')
-rw-r--r-- | Source/cmUseMangledMesaCommand.cxx | 81 |
1 files changed, 32 insertions, 49 deletions
diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx index f30071e..1eb493a 100644 --- a/Source/cmUseMangledMesaCommand.cxx +++ b/Source/cmUseMangledMesaCommand.cxx @@ -16,57 +16,53 @@ #include <cmsys/FStream.hxx> #include <cmsys/RegularExpression.hxx> -bool cmUseMangledMesaCommand -::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) +bool cmUseMangledMesaCommand::InitialPass(std::vector<std::string> const& args, + cmExecutionStatus&) { - if(this->Disallowed(cmPolicies::CMP0030, - "The use_mangled_mesa command should not be called; see CMP0030.")) - { return true; } + if (this->Disallowed( + cmPolicies::CMP0030, + "The use_mangled_mesa command should not be called; see CMP0030.")) { + return true; + } // expected two arguments: // arguement one: the full path to gl_mangle.h // arguement two : directory for output of edited headers - if(args.size() != 2) - { + if (args.size() != 2) { this->SetError("called with incorrect number of arguments"); return false; - } + } const char* inputDir = args[0].c_str(); std::string glh = inputDir; glh += "/"; glh += "gl.h"; - if(!cmSystemTools::FileExists(glh.c_str())) - { + if (!cmSystemTools::FileExists(glh.c_str())) { std::string e = "Bad path to Mesa, could not find: "; e += glh; e += " "; this->SetError(e); return false; - } + } const char* destDir = args[1].c_str(); std::vector<std::string> files; cmSystemTools::Glob(inputDir, "\\.h$", files); - if(files.empty()) - { + if (files.empty()) { cmSystemTools::Error("Could not open Mesa Directory ", inputDir); return false; - } + } cmSystemTools::MakeDirectory(destDir); - for(std::vector<std::string>::iterator i = files.begin(); - i != files.end(); ++i) - { + for (std::vector<std::string>::iterator i = files.begin(); i != files.end(); + ++i) { std::string path = inputDir; path += "/"; path += *i; this->CopyAndFullPathMesaHeader(path.c_str(), destDir); - } + } return true; } -void -cmUseMangledMesaCommand:: -CopyAndFullPathMesaHeader(const char* source, - const char* outdir) +void cmUseMangledMesaCommand::CopyAndFullPathMesaHeader(const char* source, + const char* outdir) { std::string dir, file; cmSystemTools::SplitProgramPath(source, dir, file); @@ -76,20 +72,18 @@ CopyAndFullPathMesaHeader(const char* source, std::string tempOutputFile = outFile; tempOutputFile += ".tmp"; cmsys::ofstream fout(tempOutputFile.c_str()); - if(!fout) - { + if (!fout) { cmSystemTools::Error("Could not open file for write in copy operation: ", tempOutputFile.c_str(), outdir); cmSystemTools::ReportLastSystemError(""); return; - } + } cmsys::ifstream fin(source); - if(!fin) - { + if (!fin) { cmSystemTools::Error("Could not open file for read in copy operation", source); return; - } + } // now copy input to output and expand variables in the // input file at the same time std::string inLine; @@ -100,36 +94,25 @@ CopyAndFullPathMesaHeader(const char* source, cmsys::RegularExpression glDirLine("(gl|GL)(/|\\\\)([^<\"]+)"); // regular expression for gl GL or xmesa in a file (match(1) of above) cmsys::RegularExpression glLine("(gl|GL|xmesa)"); - while(cmSystemTools::GetLineFromStream(fin,inLine)) - { - if(includeLine.find(inLine.c_str())) - { + while (cmSystemTools::GetLineFromStream(fin, inLine)) { + if (includeLine.find(inLine.c_str())) { std::string includeFile = includeLine.match(1); - if(glDirLine.find(includeFile.c_str())) - { + if (glDirLine.find(includeFile.c_str())) { std::string gfile = glDirLine.match(3); fout << "#include \"" << outdir << "/" << gfile << "\"\n"; - } - else if(glLine.find(includeFile.c_str())) - { - fout << "#include \"" << outdir << "/" << - includeLine.match(1) << "\"\n"; - } - else - { + } else if (glLine.find(includeFile.c_str())) { + fout << "#include \"" << outdir << "/" << includeLine.match(1) + << "\"\n"; + } else { fout << inLine << "\n"; - } } - else - { + } else { fout << inLine << "\n"; - } } + } // close the files before attempting to copy fin.close(); fout.close(); - cmSystemTools::CopyFileIfDifferent(tempOutputFile.c_str(), - outFile.c_str()); + cmSystemTools::CopyFileIfDifferent(tempOutputFile.c_str(), outFile.c_str()); cmSystemTools::RemoveFile(tempOutputFile.c_str()); } - |