build: update to the latest version of fmtlib and conan.

master
Michael Hope 4 years ago
parent 0886583702
commit ffe291df11
  1. 2
      cc16.cc
  2. 8
      conanfile.py
  3. 5
      cx_shuffle.cc
  4. 6
      libcc2x.cc

@ -13,7 +13,7 @@ std::string compress(string_view in) {
char last = '\0';
int count = 0;
fmt::MemoryWriter out;
std::stringstream out;
for (auto ch : in) {
if (ch != last) {

@ -4,10 +4,10 @@ class Cxx17(ConanFile):
settings = 'os', 'compiler', 'build_type', 'arch'
generators = 'cmake', 'txt'
requires = (
'fmt/latest@signal9/stable',
'Catch/latest@signal9/stable',
'range-v3/latest@signal9/stable',
'gsl/2016-01-04@anonymouz/stable',
'fmt/5.2.0@bincrafters/stable',
'Catch/1.12.1@bincrafters/stable',
'range-v3/0.4.0@ericniebler/stable',
# 'gsl_microsoft/1.0.0@bincrafters/stable',
)
build_type = 'Debug'

@ -7,7 +7,6 @@
#include <sstream>
#include <vector>
#include <range/v3/all.hpp>
#include <gsl/gsl>
#include <cstdlib>
using string_view = std::experimental::string_view;
@ -31,7 +30,7 @@ std::string join(const Container& vect, string_view sep = " ") {
template <typename Container>
Container shuffle_1(const Container& src) {
using pair = std::pair<size_t, int>;
using pair = std::pair<size_t, int>;
std::vector<pair> indexes;
int i = 0;
@ -39,7 +38,7 @@ Container shuffle_1(const Container& src) {
indexes.emplace_back(pair{i, std::rand()});
}
std::cout << join(indexes | ranges::view::keys) << "\n";
std::sort(indexes.begin(), indexes.end(), [](auto lhs, auto rhs) { return lhs.second < rhs.second; });
Container out;

@ -43,9 +43,9 @@ void dump(const Item<T>* head) {
template <typename T>
std::string to_string(const Item<T>* head) {
fmt::MemoryWriter w;
head->visit([&w](const T& value) { w << " " << value; });
return w.str();
std::stringstream w;
head->visit([&w](const T& value) { w << " " << value; });
return w.str();
}
template <typename T>

Loading…
Cancel
Save