kfr

commit d180e2207ae776d60538f5139417e1fffdfaaff7
parent 9dc5a34d8866c9e95ff8374914f177275689338a
Author: d.levin256@gmail.com <d.levin256@gmail.com>
Date:   Wed, 14 Dec 2022 07:12:43 +0000

Prefix fmt with namespace to avoid conflicts

Diffstat:
M
include/kfr/base/basic_expressions.hpp
 | 
2
+-
M
include/kfr/io/tostring.hpp
 | 
12
++++++------
M
include/kfr/simd/complex_type.hpp
 | 
4
++--

3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/kfr/base/basic_expressions.hpp b/include/kfr/base/basic_expressions.hpp
@@ -1012,7 +1012,7 @@ struct expression_trace : public expression_with_traits<E>
                                                          axis_params<VecAxis, N> sh)
     {
         const vec<value_type, N> in = get_elements(self.first(), index, sh);
-        println("[", fmt<'s', 16>(array_to_string(dims, index.data(), INT_MAX, INT_MAX, ",", "", "")),
+        println("[", cometa::fmt<'s', 16>(array_to_string(dims, index.data(), INT_MAX, INT_MAX, ",", "", "")),
                 "] = ", in);
         return in;
     }
diff --git a/include/kfr/io/tostring.hpp b/include/kfr/io/tostring.hpp
@@ -83,22 +83,22 @@ constexpr size_t number_columns         = 8;
 template <typename T>
 std::string fmtvalue(std::true_type, const T& x)
 {
-    std::string str = as_string(fmt<'g', number_width, number_precision>(x));
+    std::string str = as_string(cometa::fmt<'g', number_width, number_precision>(x));
     if (str.size() > number_width)
-        str = as_string(fmt<'g', number_width, number_precision_short>(x));
+        str = as_string(cometa::fmt<'g', number_width, number_precision_short>(x));
     return str;
 }
 
 template <typename T>
 std::string fmtvalue(std::true_type, const kfr::complex<T>& x)
 {
-    std::string restr = as_string(fmt<'g', number_width, number_precision>(x.real()));
+    std::string restr = as_string(cometa::fmt<'g', number_width, number_precision>(x.real()));
     if (restr.size() > number_width)
-        restr = as_string(fmt<'g', number_width, number_precision_short>(x.real()));
+        restr = as_string(cometa::fmt<'g', number_width, number_precision_short>(x.real()));
 
-    std::string imstr = as_string(fmt<'g', -1, number_precision>(std::abs(x.imag())));
+    std::string imstr = as_string(cometa::fmt<'g', -1, number_precision>(std::abs(x.imag())));
     if (imstr.size() > number_width)
-        imstr = as_string(fmt<'g', -1, number_precision_short>(std::abs(x.imag())));
+        imstr = as_string(cometa::fmt<'g', -1, number_precision_short>(std::abs(x.imag())));
 
     return restr + (x.imag() < T(0) ? "-" : "+") + padleft(number_width, imstr + "j");
 }
diff --git a/include/kfr/simd/complex_type.hpp b/include/kfr/simd/complex_type.hpp
@@ -115,8 +115,8 @@ struct representation<fmt_t<kfr::complex<T>, t, width, prec>>
     using type = std::string;
     static std::string get(const fmt_t<kfr::complex<T>, t, width, prec>& value)
     {
-        return as_string(fmt<t, width, prec>(value.value.real())) + " + " +
-               as_string(fmt<t, width, prec>(value.value.imag())) + "j";
+        return as_string(cometa::fmt<t, width, prec>(value.value.real())) + " + " +
+               as_string(cometa::fmt<t, width, prec>(value.value.imag())) + "j";
     }
 };
 } // namespace cometa