Commit 9d155412 by Maarten L. Hekkelman

include cstring for gnu c++ 12

parent 35c99564
...@@ -26,18 +26,18 @@ ...@@ -26,18 +26,18 @@
#pragma once #pragma once
#include <string>
#include <array> #include <array>
#include <cstring>
#include <functional> #include <functional>
#include <iomanip>
#include <iostream> #include <iostream>
#include <list> #include <list>
#include <optional> #include <optional>
#include <regex> #include <regex>
#include <set> #include <set>
#include <sstream>
#include <iomanip>
#include <shared_mutex> #include <shared_mutex>
#include <sstream>
#include <string>
#include <boost/format.hpp> #include <boost/format.hpp>
...@@ -147,12 +147,12 @@ class Item ...@@ -147,12 +147,12 @@ class Item
Item(std::string_view name, char value) Item(std::string_view name, char value)
: mName(name) : mName(name)
, mValue({ value }) , mValue({value})
{ {
} }
template<typename T, std::enable_if_t<std::is_floating_point_v<T>, int> = 0> template <typename T, std::enable_if_t<std::is_floating_point_v<T>, int> = 0>
Item(std::string_view name, const T& value, const char *fmt) Item(std::string_view name, const T &value, const char *fmt)
: mName(name) : mName(name)
, mValue((boost::format(fmt) % value).str()) , mValue((boost::format(fmt) % value).str())
{ {
...@@ -284,7 +284,7 @@ class Datablock ...@@ -284,7 +284,7 @@ class Datablock
friend bool operator==(const Datablock &lhs, const Datablock &rhs); friend bool operator==(const Datablock &lhs, const Datablock &rhs);
friend std::ostream& operator<<(std::ostream &os, const Datablock &data); friend std::ostream &operator<<(std::ostream &os, const Datablock &data);
private: private:
CategoryList mCategories; // LRU CategoryList mCategories; // LRU
...@@ -1636,7 +1636,7 @@ class conditional_iterator_proxy ...@@ -1636,7 +1636,7 @@ class conditional_iterator_proxy
using iterator = conditional_iterator_impl; using iterator = conditional_iterator_impl;
using reference = typename iterator::reference; using reference = typename iterator::reference;
template<typename... Ns> template <typename... Ns>
conditional_iterator_proxy(CategoryType &cat, row_iterator pos, Condition &&cond, Ns... names); conditional_iterator_proxy(CategoryType &cat, row_iterator pos, Condition &&cond, Ns... names);
conditional_iterator_proxy(conditional_iterator_proxy &&p); conditional_iterator_proxy(conditional_iterator_proxy &&p);
...@@ -1910,7 +1910,7 @@ class Category ...@@ -1910,7 +1910,7 @@ class Category
conditional_iterator_proxy<const Category> find(const_iterator pos, Condition &&cond) const conditional_iterator_proxy<const Category> find(const_iterator pos, Condition &&cond) const
{ {
return conditional_iterator_proxy<const Category>{const_cast<Category&>(*this), pos, std::forward<Condition>(cond)}; return conditional_iterator_proxy<const Category>{const_cast<Category &>(*this), pos, std::forward<Condition>(cond)};
} }
template <typename... Ts, typename... Ns> template <typename... Ts, typename... Ns>
...@@ -1931,14 +1931,14 @@ class Category ...@@ -1931,14 +1931,14 @@ class Category
conditional_iterator_proxy<Category, Ts...> find(const_iterator pos, Condition &&cond, Ns... names) conditional_iterator_proxy<Category, Ts...> find(const_iterator pos, Condition &&cond, Ns... names)
{ {
static_assert(sizeof...(Ts) == sizeof...(Ns), "The number of column titles should be equal to the number of types to return"); static_assert(sizeof...(Ts) == sizeof...(Ns), "The number of column titles should be equal to the number of types to return");
return {*this, pos, std::forward<Condition>(cond), std::forward<Ns>(names)... }; return {*this, pos, std::forward<Condition>(cond), std::forward<Ns>(names)...};
} }
template <typename... Ts, typename... Ns> template <typename... Ts, typename... Ns>
conditional_iterator_proxy<const Category, Ts...> find(const_iterator pos, Condition &&cond, Ns... names) const conditional_iterator_proxy<const Category, Ts...> find(const_iterator pos, Condition &&cond, Ns... names) const
{ {
static_assert(sizeof...(Ts) == sizeof...(Ns), "The number of column titles should be equal to the number of types to return"); static_assert(sizeof...(Ts) == sizeof...(Ns), "The number of column titles should be equal to the number of types to return");
return {*this, pos, std::forward<Condition>(cond), std::forward<Ns>(names)... }; return {*this, pos, std::forward<Condition>(cond), std::forward<Ns>(names)...};
} }
// -------------------------------------------------------------------- // --------------------------------------------------------------------
...@@ -1981,13 +1981,13 @@ class Category ...@@ -1981,13 +1981,13 @@ class Category
} }
template <typename T> template <typename T>
T find1(Condition &&cond, const char* column) const T find1(Condition &&cond, const char *column) const
{ {
return find1<T>(cbegin(), std::forward<Condition>(cond), column); return find1<T>(cbegin(), std::forward<Condition>(cond), column);
} }
template <typename T> template <typename T>
T find1(const_iterator pos, Condition &&cond, const char* column) const T find1(const_iterator pos, Condition &&cond, const char *column) const
{ {
auto h = find<T>(pos, std::forward<Condition>(cond), column); auto h = find<T>(pos, std::forward<Condition>(cond), column);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment