diff options
author | Mikhail Gorbushin <m.gorbushin@corp.mail.ru> | 2019-02-21 18:36:27 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2019-02-22 13:47:00 +0300 |
commit | e56537d5bd32ac798053e572672512d373e3d7be (patch) | |
tree | 804de2aa5fc78613c8d4863e05e725c63e152af5 /coding | |
parent | 475663de45f661d55e5c660b7ae15203cfbbafff (diff) |
push 3party warningt psu
Diffstat (limited to 'coding')
-rw-r--r-- | coding/simple_dense_coding.cpp | 12 | ||||
-rw-r--r-- | coding/simple_dense_coding.hpp | 15 |
2 files changed, 19 insertions, 8 deletions
diff --git a/coding/simple_dense_coding.cpp b/coding/simple_dense_coding.cpp index efb712c2da..3dd1ec5aed 100644 --- a/coding/simple_dense_coding.cpp +++ b/coding/simple_dense_coding.cpp @@ -2,8 +2,8 @@ #include "base/assert.hpp" -#include "std/algorithm.hpp" -#include "std/limits.hpp" +#include <algorithm> +#include <limits> #if defined(__clang__) #pragma clang diagnostic push @@ -20,10 +20,10 @@ namespace coding { namespace { -size_t const kAlphabetSize = static_cast<size_t>(numeric_limits<uint8_t>::max()) + 1; +size_t const kAlphabetSize = static_cast<size_t>(std::numeric_limits<uint8_t>::max()) + 1; // Calculates frequences for data symbols. -void CalcFrequences(vector<uint8_t> const & data, uint64_t frequency[]) +void CalcFrequences(std::vector<uint8_t> const & data, uint64_t frequency[]) { memset(frequency, 0, sizeof(*frequency) * kAlphabetSize); for (uint8_t symbol : data) @@ -31,7 +31,7 @@ void CalcFrequences(vector<uint8_t> const & data, uint64_t frequency[]) } } // namespace -SimpleDenseCoding::SimpleDenseCoding(vector<uint8_t> const & data) +SimpleDenseCoding::SimpleDenseCoding(std::vector<uint8_t> const & data) { // This static initialization isn't thread safe prior to C++11. uint64_t frequency[kAlphabetSize]; // Maps symbols to frequences. @@ -47,7 +47,7 @@ SimpleDenseCoding::SimpleDenseCoding(vector<uint8_t> const & data) { return frequency[lsym] > frequency[rsym]; }; - sort(symbols, symbols + kAlphabetSize, frequencyCmp); + std::sort(symbols, symbols + kAlphabetSize, frequencyCmp); for (size_t r = 0; r < kAlphabetSize; ++r) rank[symbols[r]] = r; diff --git a/coding/simple_dense_coding.hpp b/coding/simple_dense_coding.hpp index dee95e6804..e23e633a8d 100644 --- a/coding/simple_dense_coding.hpp +++ b/coding/simple_dense_coding.hpp @@ -1,8 +1,19 @@ #pragma once -#include "std/vector.hpp" +#include <cstdint> +#include <vector> +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wunused-private-field" +#endif + #include "3party/succinct/elias_fano_compressed_list.hpp" + +#if defined(__clang__) + #pragma clang diagnostic pop +#endif + namespace coding { @@ -32,7 +43,7 @@ class SimpleDenseCoding public: SimpleDenseCoding() = default; - SimpleDenseCoding(vector<uint8_t> const & data); + SimpleDenseCoding(std::vector<uint8_t> const & data); SimpleDenseCoding(SimpleDenseCoding && rhs); |