diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 10:34:04 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 16:05:19 -0400 |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmDepends.h | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | cmake-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/cmDepends.h')
-rw-r--r-- | Source/cmDepends.h | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/Source/cmDepends.h b/Source/cmDepends.h index 4f6517ed49..a62f8c281b 100644 --- a/Source/cmDepends.h +++ b/Source/cmDepends.h @@ -29,10 +29,10 @@ class cmDepends public: /** Instances need to know the build directory name and the relative path from the build directory to the target file. */ - cmDepends(cmLocalGenerator* lg=0, const char* targetDir=""); + cmDepends(cmLocalGenerator* lg = 0, const char* targetDir = ""); /** at what level will the compile be done from */ - void SetCompileDirectory(const char *dir) {this->CompileDirectory = dir;} + void SetCompileDirectory(const char* dir) { this->CompileDirectory = dir; } /** Set the local generator for the directory in which we are scanning dependencies. This is not a full local generator; it @@ -53,27 +53,30 @@ public: virtual ~cmDepends(); /** Write dependencies for the target file. */ - bool Write(std::ostream &makeDepends, std::ostream &internalDepends); + bool Write(std::ostream& makeDepends, std::ostream& internalDepends); - class DependencyVector: public std::vector<std::string> {}; + class DependencyVector : public std::vector<std::string> + { + }; /** Check dependencies for the target file. Returns true if dependencies are okay and false if they must be generated. If they must be generated Clear has already been called to wipe out the old dependencies. Dependencies which are still valid will be stored in validDeps. */ - bool Check(const char *makeFile, const char* internalFile, + bool Check(const char* makeFile, const char* internalFile, std::map<std::string, DependencyVector>& validDeps); /** Clear dependencies for the target file so they will be regenerated. */ - void Clear(const char *file); + void Clear(const char* file); /** Set the file comparison object */ - void SetFileComparison(cmFileTimeComparison* fc) { - this->FileComparison = fc; } + void SetFileComparison(cmFileTimeComparison* fc) + { + this->FileComparison = fc; + } protected: - // Write dependencies for the target file to the given stream. // Return true for success and false for failure. virtual bool WriteDependencies(const std::set<std::string>& sources, @@ -84,9 +87,9 @@ protected: // Check dependencies for the target file in the given stream. // Return false if dependencies must be regenerated and true // otherwise. - virtual bool CheckDependencies(std::istream& internalDepends, - const char* internalDependsFileName, - std::map<std::string, DependencyVector>& validDeps); + virtual bool CheckDependencies( + std::istream& internalDepends, const char* internalDependsFileName, + std::map<std::string, DependencyVector>& validDeps); // Finalize the dependency information for the target. virtual bool Finalize(std::ostream& makeDepends, @@ -117,7 +120,7 @@ protected: void SetIncludePathFromLanguage(const std::string& lang); private: - cmDepends(cmDepends const&); // Purposely not implemented. + cmDepends(cmDepends const&); // Purposely not implemented. void operator=(cmDepends const&); // Purposely not implemented. }; |