Skip to content

Commit d55f7b1

Browse files
authored
int: No longer force disabling of fmt exceptions (#5118)
I think forcing fmt to disable exceptions is probably doing more harm than good, probably does not work as expected for apps that use fmt elsewhere (when we first started using fmt, it was not super popular, so we weren't really concerned about how we might conflict with other libraries in the same app), and disabling exceptions makes it behave differently than std::format/print. So let's stop doing this and see what happens! (In main.) Also, declutter by removing the FMT_USE_GRISU definition, which was only meaningful for very old fmt versions that are older than our minimum supported version now. Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent 201fecb commit d55f7b1

File tree

1 file changed

+0
-11
lines changed
  • src/include/OpenImageIO/detail

1 file changed

+0
-11
lines changed

src/include/OpenImageIO/detail/fmt.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
# define FMT_HEADER_ONLY
1515
#endif
1616

17-
// Disable fmt exceptions
18-
#ifndef FMT_EXCEPTIONS
19-
# define FMT_EXCEPTIONS 0
20-
#endif
21-
2217
#if OIIO_VERSION_LESS(3, 1, 2)
2318
/* DEPRECATED -- remove at next ABI compatibility boundary */
2419
OIIO_NAMESPACE_3_1_BEGIN
@@ -29,12 +24,6 @@ log_fmt_error(const char* message);
2924
OIIO_NAMESPACE_3_1_END
3025
#endif
3126

32-
// Use the grisu fast floating point formatting for old fmt versions
33-
// (irrelevant for >= 7.1).
34-
#ifndef FMT_USE_GRISU
35-
# define FMT_USE_GRISU 1
36-
#endif
37-
3827
// fmt 8.1 stopped automatically enabling formatting of anything that supports
3928
// ostream output. This breaks a lot! Re-enable this old behavior.
4029
// NOTE: fmt 10.0 removed this support entirely.

0 commit comments

Comments
 (0)