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/cmComputeLinkDepends.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/cmComputeLinkDepends.h')
-rw-r--r-- | Source/cmComputeLinkDepends.h | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index ea23308..6aa40c3 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -42,10 +42,20 @@ public: cmGeneratorTarget const* Target; bool IsSharedDep; bool IsFlag; - LinkEntry(): Item(), Target(0), IsSharedDep(false), IsFlag(false) {} - LinkEntry(LinkEntry const& r): - Item(r.Item), Target(r.Target), IsSharedDep(r.IsSharedDep), - IsFlag(r.IsFlag) {} + LinkEntry() + : Item() + , Target(0) + , IsSharedDep(false) + , IsFlag(false) + { + } + LinkEntry(LinkEntry const& r) + : Item(r.Item) + , Target(r.Target) + , IsSharedDep(r.IsSharedDep) + , IsFlag(r.IsFlag) + { + } }; typedef std::vector<LinkEntry> EntryVector; @@ -53,10 +63,11 @@ public: void SetOldLinkDirMode(bool b); std::set<cmGeneratorTarget const*> const& GetOldWrongConfigItems() const - { return this->OldWrongConfigItems; } + { + return this->OldWrongConfigItems; + } private: - // Context information. cmGeneratorTarget const* Target; cmMakefile* Makefile; @@ -65,13 +76,13 @@ private: std::string Config; EntryVector FinalLinkEntries; - std::map<std::string, int>::iterator - AllocateLinkEntry(std::string const& item); + std::map<std::string, int>::iterator AllocateLinkEntry( + std::string const& item); int AddLinkEntry(cmLinkItem const& item); void AddVarLinkEntries(int depender_index, const char* value); void AddDirectLinkEntries(); template <typename T> - void AddLinkEntries(int depender_index, std::vector<T> const& libs); + void AddLinkEntries(int depender_index, std::vector<T> const& libs); cmGeneratorTarget const* FindTargetToLink(int depender_index, const std::string& name); @@ -98,16 +109,19 @@ private: }; std::queue<SharedDepEntry> SharedDepQueue; std::set<int> SharedDepFollowed; - void FollowSharedDeps(int depender_index, - cmLinkInterface const* iface, + void FollowSharedDeps(int depender_index, cmLinkInterface const* iface, bool follow_interface = false); void QueueSharedDependencies(int depender_index, std::vector<cmLinkItem> const& deps); void HandleSharedDependency(SharedDepEntry const& dep); // Dependency inferral for each link item. - struct DependSet: public std::set<int> {}; - struct DependSetList: public std::vector<DependSet> {}; + struct DependSet : public std::set<int> + { + }; + struct DependSetList : public std::vector<DependSet> + { + }; std::vector<DependSetList*> InferredDependSets; void InferDependencies(); |