fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 18:57:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

export names only once (#3392)

Browse Source 
names declared to be exported at the point of introduction into a namespace *must not* be (re-)declared as exported later in the TU, e.g. when they are redeclared, defined, or specialized. [module.export]/6

Drive-by fix found during module testing: add a missing `detail::` name qualification
This commit is contained in:
Daniela Engert
2023-04-22 15:21:06 +02:00
committed by GitHub
parent 93e81bb5d8
commit c039389223
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/args.h
View File

@ -59,7 +59,6 @@ class dynamic_arg_list {
} }
}; };
} // namespace detail } // namespace detail
FMT_BEGIN_EXPORT
/** /**
\rst \rst
@ -230,7 +229,6 @@ class dynamic_format_arg_store
} }
}; };
FMT_END_EXPORT
FMT_END_NAMESPACE FMT_END_NAMESPACE
#endif // FMT_ARGS_H_ #endif // FMT_ARGS_H_

7
include/fmt/core.h
View File

@ -1482,7 +1482,6 @@ enum { max_packed_args = 62 / packed_arg_bits };
enum : unsigned long long { is_unpacked_bit = 1ULL << 63 }; enum : unsigned long long { is_unpacked_bit = 1ULL << 63 };
enum : unsigned long long { has_named_args_bit = 1ULL << 62 }; enum : unsigned long long { has_named_args_bit = 1ULL << 62 };
} // namespace detail } // namespace detail
FMT_BEGIN_EXPORT
// An output iterator that appends to a buffer. // An output iterator that appends to a buffer.
// It is used to reduce symbol sizes for the common case. // It is used to reduce symbol sizes for the common case.
@ -1560,6 +1559,7 @@ template <typename Context> class basic_format_arg {
``vis(value)`` will be called with the value of type ``double``. ``vis(value)`` will be called with the value of type ``double``.
\endrst \endrst
*/ */
FMT_MODULE_EXPORT
template <typename Visitor, typename Context> template <typename Visitor, typename Context>
FMT_CONSTEXPR FMT_INLINE auto visit_format_arg( FMT_CONSTEXPR FMT_INLINE auto visit_format_arg(
Visitor&& vis, const basic_format_arg<Context>& arg) -> decltype(vis(0)) { Visitor&& vis, const basic_format_arg<Context>& arg) -> decltype(vis(0)) {
@ -1601,7 +1601,6 @@ FMT_CONSTEXPR FMT_INLINE auto visit_format_arg(
return vis(monostate()); return vis(monostate());
} }
FMT_END_EXPORT
namespace detail { namespace detail {
template <typename Char, typename InputIt> template <typename Char, typename InputIt>
@ -1861,6 +1860,7 @@ inline auto arg(const Char* name, const T& arg) -> detail::named_arg<Char, T> {
static_assert(!detail::is_named_arg<T>(), "nested named arguments"); static_assert(!detail::is_named_arg<T>(), "nested named arguments");
return {name, arg}; return {name, arg};
} }
FMT_END_EXPORT
/** /**
\rst \rst
@ -1986,7 +1986,7 @@ template <typename Context> class basic_format_args {
/** An alias to ``basic_format_args<format_context>``. */ /** An alias to ``basic_format_args<format_context>``. */
// A separate type would result in shorter symbols but break ABI compatibility // A separate type would result in shorter symbols but break ABI compatibility
// between clang and gcc on ARM (#1919). // between clang and gcc on ARM (#1919).
using format_args = basic_format_args<format_context>; FMT_MODULE_EXPORT using format_args = basic_format_args<format_context>;
// We cannot use enum classes as bit fields because of a gcc bug, so we put them // We cannot use enum classes as bit fields because of a gcc bug, so we put them
// in namespaces instead (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414). // in namespaces instead (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414).
@ -2007,7 +2007,6 @@ enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, minus, plus, space};
} }
using sign_t = sign::type; using sign_t = sign::type;
FMT_END_EXPORT
namespace detail { namespace detail {
// Workaround an array initialization issue in gcc 4.8. // Workaround an array initialization issue in gcc 4.8.

2
include/fmt/ostream.h
View File

@ -111,7 +111,7 @@ struct basic_ostream_formatter : formatter<basic_string_view<Char>, Char> {
auto format(const T& value, basic_format_context<OutputIt, Char>& ctx) const auto format(const T& value, basic_format_context<OutputIt, Char>& ctx) const
-> OutputIt { -> OutputIt {
auto buffer = basic_memory_buffer<Char>(); auto buffer = basic_memory_buffer<Char>();
format_value(buffer, value, ctx.locale()); detail::format_value(buffer, value, ctx.locale());
return formatter<basic_string_view<Char>, Char>::format( return formatter<basic_string_view<Char>, Char>::format(
{buffer.data(), buffer.size()}, ctx); {buffer.data(), buffer.size()}, ctx);
} }