diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | remoting/base/capabilities.cc | 14 |
2 files changed, 5 insertions, 10 deletions
@@ -400,6 +400,7 @@ Yong Shin <sy3620@gmail.com> Yongsheng Zhu <yongsheng.zhu@intel.com> Yoshinori Sano <yoshinori.sano@gmail.com> YoungKi Hong <simon.hong81@gmail.com> +Youngsun Suh <zard17@gmail.com> Yumikiyo Osanai <yumios.art@gmail.com> Yuri Gorobets <yuri.gorobets@gmail.com> Zeno Albisser <zeno.albisser@digia.com> diff --git a/remoting/base/capabilities.cc b/remoting/base/capabilities.cc index 33cf0ee..4e52ef8 100644 --- a/remoting/base/capabilities.cc +++ b/remoting/base/capabilities.cc @@ -7,6 +7,7 @@ #include <algorithm> #include <vector> +#include "base/stl_util.h" #include "base/strings/string_util.h" namespace remoting { @@ -27,16 +28,9 @@ std::string IntersectCapabilities(const std::string& client_capabilities, Tokenize(host_capabilities, " ", &host_caps); std::sort(host_caps.begin(), host_caps.end()); - std::vector<std::string> result(std::min(client_caps.size(), - host_caps.size())); - std::vector<std::string>::iterator end = - std::set_intersection(client_caps.begin(), - client_caps.end(), - host_caps.begin(), - host_caps.end(), - result.begin()); - if (end != result.end()) - result.erase(end, result.end()); + std::vector<std::string> result = + base::STLSetIntersection<std::vector<std::string> >( + client_caps, host_caps); return JoinString(result, " "); } |