Skip to content

use conduit specific define to ensure fmt header only and exception use #1594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cyrush merged 1 commit into from
May 8, 2026
Merged

use conduit specific define to ensure fmt header only and exception use #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,18 @@
#endif

// Check if exceptions are disabled.
#ifdef FMT_USE_EXCEPTIONS
#ifdef CONDUIT_FMT_USE_EXCEPTIONS
// Use the provided definition.
#elif defined(__GNUC__) && !defined(__EXCEPTIONS)
# define FMT_USE_EXCEPTIONS 0
# define CONDUIT_FMT_USE_EXCEPTIONS 0
#elif defined(__clang__) && !defined(__cpp_exceptions)
# define FMT_USE_EXCEPTIONS 0
# define CONDUIT_FMT_USE_EXCEPTIONS 0
#elif FMT_MSC_VERSION && !_HAS_EXCEPTIONS
# define FMT_USE_EXCEPTIONS 0
# define CONDUIT_FMT_USE_EXCEPTIONS 0
#else
# define FMT_USE_EXCEPTIONS 1
# define CONDUIT_FMT_USE_EXCEPTIONS 1
#endif
#if FMT_USE_EXCEPTIONS
#if CONDUIT_FMT_USE_EXCEPTIONS
# define FMT_TRY try
# define FMT_CATCH(x) catch (x)
#else
Expand Down Expand Up @@ -284,7 +284,7 @@ FMT_PRAGMA_GCC(diagnostic push)
# define FMT_WIN32 0
#endif

#if !defined(FMT_HEADER_ONLY) && FMT_WIN32
#if !defined(CONDUIT_FMT_HEADER_ONLY) && FMT_WIN32
# if defined(FMT_LIB_EXPORT)
# define FMT_API __declspec(dllexport)
# elif defined(FMT_SHARED)
Expand Down Expand Up @@ -3035,7 +3035,7 @@ FMT_PRAGMA_GCC(pop_options)
FMT_END_EXPORT
FMT_END_NAMESPACE

#ifdef FMT_HEADER_ONLY
#ifdef CONDUIT_FMT_HEADER_ONLY
# include "format.h"
#endif
#endif // FMT_BASE_H_
4 changes: 2 additions & 2 deletions src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/conduit_fmt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#ifndef CONDUIT_FMT_HPP
#define CONDUIT_FMT_HPP

#define FMT_EXCEPTIONS 1
#define FMT_HEADER_ONLY 1
#define CONDUIT_FMT_USE_EXCEPTIONS 1
#define CONDUIT_FMT_HEADER_ONLY 1

// Include all fmt header files
#include "format.h"
Expand Down
8 changes: 4 additions & 4 deletions src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ template <typename T> struct iterator_traits<conduit_fmt::basic_appender<T>> {

#ifdef FMT_THROW
// Use the provided definition.
#elif FMT_USE_EXCEPTIONS
#elif CONDUIT_FMT_USE_EXCEPTIONS
# define FMT_THROW(x) throw x
#else
# define FMT_THROW(x) ::conduit_fmt::assert_fail(__FILE__, __LINE__, (x).what())
Expand Down Expand Up @@ -1182,7 +1182,7 @@ template <> inline auto decimal_point(locale_ref loc) -> wchar_t {
return decimal_point_impl<wchar_t>(loc);
}

#ifndef FMT_HEADER_ONLY
#ifndef CONDUIT_FMT_HEADER_ONLY
FMT_BEGIN_EXPORT
extern template FMT_API auto thousands_sep_impl<char>(locale_ref)
-> thousands_sep_result<char>;
Expand All @@ -1191,7 +1191,7 @@ extern template FMT_API auto thousands_sep_impl<wchar_t>(locale_ref)
extern template FMT_API auto decimal_point_impl(locale_ref) -> char;
extern template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t;
FMT_END_EXPORT
#endif // FMT_HEADER_ONLY
#endif // CONDUIT_FMT_HEADER_ONLY

// Compares two characters for equality.
template <typename Char> auto equal2(const Char* lhs, const char* rhs) -> bool {
Expand Down Expand Up @@ -4382,7 +4382,7 @@ FMT_NODISCARD FMT_CONSTEXPR_STRING auto to_string(const T& value)
FMT_END_EXPORT
FMT_END_NAMESPACE

#ifdef FMT_HEADER_ONLY
#ifdef CONDUIT_FMT_HEADER_ONLY
# define FMT_FUNC inline
# include "format-inl.h"
#endif
Expand Down
Loading