diff options
Diffstat (limited to 'search/search_quality')
5 files changed, 28 insertions, 24 deletions
diff --git a/search/search_quality/assessment_tool/main_model.hpp b/search/search_quality/assessment_tool/main_model.hpp index 31a39aac15..b2e7d2469e 100644 --- a/search/search_quality/assessment_tool/main_model.hpp +++ b/search/search_quality/assessment_tool/main_model.hpp @@ -10,9 +10,10 @@ #include "base/thread_checker.hpp" +#include <cstddef> #include <cstdint> -#include <vector> #include <memory> +#include <vector> #include <boost/optional.hpp> diff --git a/search/search_quality/features_collector_tool/features_collector_tool.cpp b/search/search_quality/features_collector_tool/features_collector_tool.cpp index 4bd027d3b4..db92f2e903 100644 --- a/search/search_quality/features_collector_tool/features_collector_tool.cpp +++ b/search/search_quality/features_collector_tool/features_collector_tool.cpp @@ -25,12 +25,13 @@ #include "base/macros.hpp" #include "base/string_utils.hpp" -#include "std/fstream.hpp" -#include "std/iostream.hpp" -#include "std/limits.hpp" -#include "std/string.hpp" -#include "std/unique_ptr.hpp" -#include "std/vector.hpp" +#include <cstddef> +#include <fstream> +#include <iostream> +#include <limits> +#include <memory> +#include <string> +#include <vector> #include "defines.hpp" @@ -38,6 +39,7 @@ using namespace search::tests_support; using namespace search; +using namespace std; using namespace storage; DEFINE_string(data_path, "", "Path to data directory (resources dir)"); diff --git a/search/search_quality/matcher.hpp b/search/search_quality/matcher.hpp index 802f09c460..09dcc04d41 100644 --- a/search/search_quality/matcher.hpp +++ b/search/search_quality/matcher.hpp @@ -3,7 +3,7 @@ #include "search/result.hpp" #include "search/search_quality/sample.hpp" -#include <cstdint> +#include <cstddef> #include <limits> #include <vector> diff --git a/search/search_quality/sample.cpp b/search/search_quality/sample.cpp index 2f8ace2f91..e676d8db0f 100644 --- a/search/search_quality/sample.cpp +++ b/search/search_quality/sample.cpp @@ -35,7 +35,7 @@ bool LessRect(m2::RectD const & lhs, m2::RectD const & rhs) } template <typename T> -bool Less(std::vector<T> lhs, std::vector<T> rhs) +bool Less(vector<T> lhs, vector<T> rhs) { sort(lhs.begin(), lhs.end()); sort(rhs.begin(), rhs.end()); @@ -43,7 +43,7 @@ bool Less(std::vector<T> lhs, std::vector<T> rhs) } template <typename T> -bool Equal(std::vector<T> lhs, std::vector<T> rhs) +bool Equal(vector<T> lhs, vector<T> rhs) { sort(lhs.begin(), lhs.end()); sort(rhs.begin(), rhs.end()); @@ -131,7 +131,7 @@ bool Sample::operator<(Sample const & rhs) const bool Sample::operator==(Sample const & rhs) const { return !(*this < rhs) && !(rhs < *this); } // static -bool Sample::DeserializeFromJSONLines(string const & lines, std::vector<Sample> & samples) +bool Sample::DeserializeFromJSONLines(string const & lines, vector<Sample> & samples) { istringstream is(lines); string line; @@ -153,7 +153,7 @@ bool Sample::DeserializeFromJSONLines(string const & lines, std::vector<Sample> } // static -void Sample::SerializeToJSONLines(std::vector<Sample> const & samples, std::string & lines) +void Sample::SerializeToJSONLines(vector<Sample> const & samples, string & lines) { for (auto const & sample : samples) { diff --git a/search/search_quality/search_quality_tool/search_quality_tool.cpp b/search/search_quality/search_quality_tool/search_quality_tool.cpp index 9d1444a3be..b0d3de4c31 100644 --- a/search/search_quality/search_quality_tool/search_quality_tool.cpp +++ b/search/search_quality/search_quality_tool/search_quality_tool.cpp @@ -32,18 +32,18 @@ #include "base/string_utils.hpp" #include "base/timer.hpp" -#include "std/algorithm.hpp" -#include "std/cmath.hpp" -#include "std/cstdio.hpp" -#include "std/fstream.hpp" -#include "std/iomanip.hpp" -#include "std/iostream.hpp" -#include "std/limits.hpp" -#include "std/map.hpp" -#include "std/numeric.hpp" -#include "std/sstream.hpp" -#include "std/string.hpp" -#include "std/vector.hpp" +#include <algorithm> +#include <cmath> +#include <cstdio> +#include <fstream> +#include <iomanip> +#include <iostream> +#include <limits> +#include <map> +#include <numeric> +#include <sstream> +#include <string> +#include <vector> #include "defines.hpp" @@ -51,6 +51,7 @@ using namespace search::tests_support; using namespace search; +using namespace std; using namespace storage; DEFINE_string(data_path, "", "Path to data directory (resources dir)"); |