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/cmComputeLinkInformation.h | |
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/cmComputeLinkInformation.h')
-rw-r--r-- | Source/cmComputeLinkInformation.h | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h index 5eecf7d..c0ddc53 100644 --- a/Source/cmComputeLinkInformation.h +++ b/Source/cmComputeLinkInformation.h @@ -35,11 +35,24 @@ public: struct Item { - Item(): Value(), IsPath(true), Target(0) {} - Item(Item const& item): - Value(item.Value), IsPath(item.IsPath), Target(item.Target) {} - Item(std::string const& v, bool p, cmGeneratorTarget const* target = 0): - Value(v), IsPath(p), Target(target) {} + Item() + : Value() + , IsPath(true) + , Target(0) + { + } + Item(Item const& item) + : Value(item.Value) + , IsPath(item.IsPath) + , Target(item.Target) + { + } + Item(std::string const& v, bool p, cmGeneratorTarget const* target = 0) + : Value(v) + , IsPath(p) + , Target(target) + { + } std::string Value; bool IsPath; cmGeneratorTarget const* Target; @@ -60,6 +73,7 @@ public: std::string const& GetRPathLinkFlag() const { return this->RPathLinkFlag; } std::string GetRPathLinkString(); + private: void AddItem(std::string const& item, const cmGeneratorTarget* tgt); void AddSharedDepItem(std::string const& item, cmGeneratorTarget const* tgt); @@ -101,7 +115,12 @@ private: std::string RPathLinkFlag; SharedDepMode SharedDependencyMode; - enum LinkType { LinkUnknown, LinkStatic, LinkShared }; + enum LinkType + { + LinkUnknown, + LinkStatic, + LinkShared + }; void SetCurrentLinkType(LinkType lt); // Link type adjustment. @@ -184,7 +203,6 @@ private: void AddLibraryRuntimeInfo(std::string const& fullPath, const cmGeneratorTarget* target); void AddLibraryRuntimeInfo(std::string const& fullPath); - }; #endif |