From 962c379299753e8df4fdc99d920c556ab7f27373 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 13 Sep 2020 10:41:37 +0800 Subject: [PATCH] Fix build fail --- trunk/src/app/srs_app_config.cpp | 8 ++++---- trunk/src/app/srs_app_conn.cpp | 4 ++-- trunk/src/protocol/srs_http_stack.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 625a3690c..ec2136d29 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -298,7 +298,7 @@ bool srs_config_apply_filter(SrsConfDirective* dvr_apply, SrsRequest* req) } string id = req->app + "/" + req->stream; - if (::find(args.begin(), args.end(), id) != args.end()) { + if (std::find(args.begin(), args.end(), id) != args.end()) { return true; } @@ -786,7 +786,7 @@ SrsConfDirective* SrsConfDirective::set_arg0(string a0) void SrsConfDirective::remove(SrsConfDirective* v) { std::vector::iterator it; - if ((it = ::find(directives.begin(), directives.end(), v)) != directives.end()) { + if ((it = std::find(directives.begin(), directives.end(), v)) != directives.end()) { directives.erase(it); } } @@ -3186,7 +3186,7 @@ srs_error_t SrsConfig::raw_enable_dvr(string vhost, string stream, bool& applied conf->args.clear(); } - if (::find(conf->args.begin(), conf->args.end(), stream) == conf->args.end()) { + if (std::find(conf->args.begin(), conf->args.end(), stream) == conf->args.end()) { conf->args.push_back(stream); } @@ -3210,7 +3210,7 @@ srs_error_t SrsConfig::raw_disable_dvr(string vhost, string stream, bool& applie std::vector::iterator it; - if ((it = ::find(conf->args.begin(), conf->args.end(), stream)) != conf->args.end()) { + if ((it = std::find(conf->args.begin(), conf->args.end(), stream)) != conf->args.end()) { conf->args.erase(it); } diff --git a/trunk/src/app/srs_app_conn.cpp b/trunk/src/app/srs_app_conn.cpp index 6be1ea935..7cb4a15b2 100644 --- a/trunk/src/app/srs_app_conn.cpp +++ b/trunk/src/app/srs_app_conn.cpp @@ -88,7 +88,7 @@ srs_error_t SrsConnectionManager::cycle() void SrsConnectionManager::add(ISrsConnection* conn) { - if (::find(conns_.begin(), conns_.end(), conn) == conns_.end()) { + if (std::find(conns_.begin(), conns_.end(), conn) == conns_.end()) { conns_.push_back(conn); } } @@ -124,7 +124,7 @@ ISrsConnection* SrsConnectionManager::find_by_name(std::string name) void SrsConnectionManager::remove(ISrsConnection* c) { - if (::find(zombies_.begin(), zombies_.end(), c) == zombies_.end()) { + if (std::find(zombies_.begin(), zombies_.end(), c) == zombies_.end()) { zombies_.push_back(c); srs_cond_signal(cond); } diff --git a/trunk/src/protocol/srs_http_stack.cpp b/trunk/src/protocol/srs_http_stack.cpp index 904ad419a..4416824fd 100644 --- a/trunk/src/protocol/srs_http_stack.cpp +++ b/trunk/src/protocol/srs_http_stack.cpp @@ -620,7 +620,7 @@ srs_error_t SrsHttpServeMux::initialize() void SrsHttpServeMux::hijack(ISrsHttpMatchHijacker* h) { - std::vector::iterator it = ::find(hijackers.begin(), hijackers.end(), h); + std::vector::iterator it = std::find(hijackers.begin(), hijackers.end(), h); if (it != hijackers.end()) { return; } @@ -629,7 +629,7 @@ void SrsHttpServeMux::hijack(ISrsHttpMatchHijacker* h) void SrsHttpServeMux::unhijack(ISrsHttpMatchHijacker* h) { - std::vector::iterator it = ::find(hijackers.begin(), hijackers.end(), h); + std::vector::iterator it = std::find(hijackers.begin(), hijackers.end(), h); if (it == hijackers.end()) { return; }