From 838f86b0fd880b26539664140f04e5d16669dad8 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 24 May 2020 22:29:21 +0100 Subject: style(3p/nix): Remove 'using std::*' from types.hh It is considered bad form to use things from includes in headers, as these directives propagate to everywhere else and can make it confusing. types.hh (which is includes almost literally everywhere) had some of these directives, which this commit removes. --- third_party/nix/src/libstore/s3-binary-cache-store.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libstore/s3-binary-cache-store.cc') diff --git a/third_party/nix/src/libstore/s3-binary-cache-store.cc b/third_party/nix/src/libstore/s3-binary-cache-store.cc index df3afab3cf32..2b25fd874437 100644 --- a/third_party/nix/src/libstore/s3-binary-cache-store.cc +++ b/third_party/nix/src/libstore/s3-binary-cache-store.cc @@ -77,8 +77,8 @@ static void initAWS() { }); } -S3Helper::S3Helper(const string& profile, const string& region, - const string& scheme, const string& endpoint) +S3Helper::S3Helper(const std::string& profile, const std::string& region, + const std::string& scheme, const std::string& endpoint) : config(makeConfig(region, scheme, endpoint)), client(make_ref( profile == "" @@ -114,7 +114,8 @@ class RetryStrategy : public Aws::Client::DefaultRetryStrategy { }; ref S3Helper::makeConfig( - const string& region, const string& scheme, const string& endpoint) { + const std::string& region, const std::string& scheme, + const std::string& endpoint) { initAWS(); auto res = make_ref(); res->region = region; -- cgit 1.4.1