Remove redundant std:: thoughout the repository

trojan-gfw · Mar 22, 2020 · 26637b3 · 26637b3
1 parent 9d001d5
commit 26637b3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/core/authenticator.cpp b/src/core/authenticator.cpp
@@ -73,7 +73,7 @@ bool Authenticator::auth(const string &password) {
     return true;
 }
 
-void Authenticator::record(const std::string &password, uint64_t download, uint64_t upload) {
+void Authenticator::record(const string &password, uint64_t download, uint64_t upload) {
     if (!is_valid_password(password)) {
         return;
     }
@@ -82,7 +82,7 @@ void Authenticator::record(const std::string &password, uint64_t download, uint6
     }
 }
 
-bool Authenticator::is_valid_password(const std::string &password) {
+bool Authenticator::is_valid_password(const string &password) {
     if (password.size() != PASSWORD_LENGTH) {
         return false;
     }
@@ -102,8 +102,8 @@ Authenticator::~Authenticator() {
 
 Authenticator::Authenticator(const Config&) {}
 bool Authenticator::auth(const string&) { return true; }
-void Authenticator::record(const std::string&, uint64_t, uint64_t) {}
-bool Authenticator::is_valid_password(const std::string&) { return true; }
+void Authenticator::record(const string&, uint64_t, uint64_t) {}
+bool Authenticator::is_valid_password(const string&) { return true; }
 Authenticator::~Authenticator() {}
 
 #endif // ENABLE_MYSQL
diff --git a/src/core/config.cpp b/src/core/config.cpp
@@ -32,7 +32,7 @@ void Config::load(const string &filename) {
     populate(tree);
 }
 
-void Config::populate(const std::string &JSON) {
+void Config::populate(const string &JSON) {
     istringstream s(JSON);
     ptree tree;
     read_json(s, tree);

diff --git a/src/proto/trojanrequest.cpp b/src/proto/trojanrequest.cpp
@@ -40,7 +40,7 @@ int TrojanRequest::parse(const string &data) {
     return data.length();
 }
 
-std::string TrojanRequest::generate(const std::string &password, const std::string &domainname, uint16_t port, bool tcp) {
+string TrojanRequest::generate(const string &password, const string &domainname, uint16_t port, bool tcp) {
     string ret = password + "\r\n";
     if (tcp) {
         ret += '\x01';

diff --git a/src/session/serversession.cpp b/src/session/serversession.cpp
@@ -163,7 +163,7 @@ void ServerSession::in_recv(const string &data) {
             if (alpn_out == NULL) {
                 return config.remote_port;
             }
-            auto it = config.ssl.alpn_port_override.find(std::string(alpn_out, alpn_out + alpn_len));
+            auto it = config.ssl.alpn_port_override.find(string(alpn_out, alpn_out + alpn_len));
             return it == config.ssl.alpn_port_override.end() ? config.remote_port : it->second;
         }());
         if (valid) {