diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2022-02-21 16:37:25 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2022-02-21 16:37:25 +0100 |
commit | 36c7b12f3354606a50808197f6695c185fd02893 (patch) | |
tree | fbd1e816de491509af74ce21eed1ae1923e8acb9 /src/libstore | |
parent | 1ac2664472d0135503e54f0d924a802023855003 (diff) |
Remove std::string alias
Diffstat (limited to 'src/libstore')
-rw-r--r-- | src/libstore/machines.hh | 14 | ||||
-rw-r--r-- | src/libstore/names.hh | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libstore/machines.hh b/src/libstore/machines.hh index 341d9bd97..834626de9 100644 --- a/src/libstore/machines.hh +++ b/src/libstore/machines.hh @@ -8,19 +8,19 @@ class Store; struct Machine { - const string storeUri; - const std::vector<string> systemTypes; - const string sshKey; + const std::string storeUri; + const std::vector<std::string> systemTypes; + const std::string sshKey; const unsigned int maxJobs; const unsigned int speedFactor; - const std::set<string> supportedFeatures; - const std::set<string> mandatoryFeatures; + const std::set<std::string> supportedFeatures; + const std::set<std::string> mandatoryFeatures; const std::string sshPublicHostKey; bool enabled = true; - bool allSupported(const std::set<string> & features) const; + bool allSupported(const std::set<std::string> & features) const; - bool mandatoryMet(const std::set<string> & features) const; + bool mandatoryMet(const std::set<std::string> & features) const; Machine(decltype(storeUri) storeUri, decltype(systemTypes) systemTypes, diff --git a/src/libstore/names.hh b/src/libstore/names.hh index ecbad10b3..3977fc6cc 100644 --- a/src/libstore/names.hh +++ b/src/libstore/names.hh @@ -10,9 +10,9 @@ struct Regex; struct DrvName { - string fullName; - string name; - string version; + std::string fullName; + std::string name; + std::string version; unsigned int hits; DrvName(); |