diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-03-27 14:50:17 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2019-03-27 17:12:43 (GMT) |
commit | 87341d8328c7b3a1d50cfd534ff4cb44334a2561 (patch) | |
tree | 83479c41db2da0c4282565927d60150f5e5ac727 /Source/cmDependsJava.h | |
parent | 5a15c9e7cb63fb5b884271a1184607a8fa87d442 (diff) | |
download | CMake-87341d8328c7b3a1d50cfd534ff4cb44334a2561.zip CMake-87341d8328c7b3a1d50cfd534ff4cb44334a2561.tar.gz CMake-87341d8328c7b3a1d50cfd534ff4cb44334a2561.tar.bz2 |
cmDepends: Define DependencyMap instead of DependencyVector
In `cmDepends` use
`typedef std::map<std::string, std::vector<std::string>> DependencyMap`
instead of defining a
`class DependencyVector : public std::vector<std::string>`
and using it in `std::map<std::string, DependencyVector>`.
Since `std::map<std::string, std::vector<std::string>>` is used in various
other places, we now reuse all of it's auto generated methods. This doesn't
happen when we use `DependencyVector` in a `std::map`, because it is a
different class than `std::vector<std::string>`.
Diffstat (limited to 'Source/cmDependsJava.h')
-rw-r--r-- | Source/cmDependsJava.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmDependsJava.h b/Source/cmDependsJava.h index 109ef13..dd671a1 100644 --- a/Source/cmDependsJava.h +++ b/Source/cmDependsJava.h @@ -8,7 +8,6 @@ #include "cmDepends.h" #include <iosfwd> -#include <map> #include <set> #include <string> @@ -33,9 +32,9 @@ protected: bool WriteDependencies(const std::set<std::string>& sources, const std::string& file, std::ostream& makeDepends, std::ostream& internalDepends) override; - bool CheckDependencies( - std::istream& internalDepends, const std::string& internalDependsFileName, - std::map<std::string, DependencyVector>& validDeps) override; + bool CheckDependencies(std::istream& internalDepends, + const std::string& internalDependsFileName, + DependencyMap& validDeps) override; }; #endif |