Commit 42643288 by Maarten L. Hekkelman

back on linux

parent 9bc33818
...@@ -151,7 +151,7 @@ class iterator_impl ...@@ -151,7 +151,7 @@ class iterator_impl
} }
private: private:
template <uint16_t... Is> template <size_t... Is>
tuple_type get(std::index_sequence<Is...>) const tuple_type get(std::index_sequence<Is...>) const
{ {
if (m_current != nullptr) if (m_current != nullptr)
......
...@@ -57,7 +57,7 @@ namespace detail ...@@ -57,7 +57,7 @@ namespace detail
return get<Ts...>(std::index_sequence_for<Ts...>{}); return get<Ts...>(std::index_sequence_for<Ts...>{});
} }
template <typename... Ts, uint16_t... Is> template <typename... Ts, size_t... Is>
std::tuple<Ts...> get(std::index_sequence<Is...>) const std::tuple<Ts...> get(std::index_sequence<Is...>) const
{ {
return std::tuple<Ts...>{ m_row[m_columns[Is]].template as<Ts>()... }; return std::tuple<Ts...>{ m_row[m_columns[Is]].template as<Ts>()... };
......
...@@ -409,8 +409,8 @@ enum class chars_format ...@@ -409,8 +409,8 @@ enum class chars_format
template <typename FloatType, std::enable_if_t<std::is_floating_point_v<FloatType>, int> = 0> template <typename FloatType, std::enable_if_t<std::is_floating_point_v<FloatType>, int> = 0>
std::to_chars_result to_chars(char *first, char *last, FloatType &value, chars_format fmt) std::to_chars_result to_chars(char *first, char *last, FloatType &value, chars_format fmt)
{ {
size_t size = last - first; int size = static_cast<int>(last - first);
size_t r = 0; int r = 0;
switch (fmt) switch (fmt)
{ {
......
...@@ -54,9 +54,9 @@ void atom::atom_impl::moveTo(const point &p) ...@@ -54,9 +54,9 @@ void atom::atom_impl::moveTo(const point &p)
r.assign("Cartn_y", std::format("{:.3f}", p.m_y), false, false); r.assign("Cartn_y", std::format("{:.3f}", p.m_y), false, false);
r.assign("Cartn_z", std::format("{:.3f}", p.m_z), false, false); r.assign("Cartn_z", std::format("{:.3f}", p.m_z), false, false);
#else #else
r.assign("Cartn_x", cif::format"%.3f", p.m_x).str(), false, false); r.assign("Cartn_x", cif::format("%.3f", p.m_x).str(), false, false);
r.assign("Cartn_y", cif::format"%.3f", p.m_y).str(), false, false); r.assign("Cartn_y", cif::format("%.3f", p.m_y).str(), false, false);
r.assign("Cartn_z", format("%.3f", p.m_z).str(), false, false); r.assign("Cartn_z", cif::format("%.3f", p.m_z).str(), false, false);
#endif #endif
m_location = p; m_location = p;
} }
......
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