Skip to content

Commit 148d40a

Browse files
authored
Merge branch 'master' into remove_config
2 parents 841116c + 8ccc307 commit 148d40a

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.ci/install-freebsd.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pkg info # debug
1212
pkg install "llvm$LLVM_COMPILER_VER"
1313

1414
# Mandatory dependencies (qtX-base is pulled via qtX-multimedia)
15-
pkg install git ccache cmake ninja "qt$QT_VER_MAIN-multimedia" "qt$QT_VER_MAIN-svg" glew openal-soft ffmpeg
15+
pkg install git ccache cmake ninja "qt$QT_VER_MAIN-multimedia" "qt$QT_VER_MAIN-svg" glew openal-soft ffmpeg pcre2
1616

1717
# Optional dependencies (libevdev is pulled by qtX-base)
1818
pkg install pkgconf alsa-lib pulseaudio sdl3 evdev-proto vulkan-headers vulkan-loader opencv

Utilities/StrFmt.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,10 @@ namespace fmt
392392
{
393393
raw_throw_exception(src_loc, reinterpret_cast<const char*>(fmt), type_info_v<Args...>, fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
394394
}
395+
396+
#if !defined(_MSC_VER) || defined(__clang__)
397+
[[noreturn]] ~throw_exception();
398+
#endif
395399
};
396400

397401
template <typename CharT, usz N, typename... Args>

0 commit comments

Comments
 (0)