diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2024-05-09 08:29:50 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-09 08:29:50 +1000 |
| commit | 49fd0cd39fb22ea43bc339aba046a340cb9d7fab (patch) | |
| tree | 50a9cba28afad7cc9edfd680d965ab6753b8ddcd | |
| parent | 06dd31e86630c2a370ada4f5e9defbbc15a1249e (diff) | |
| parent | b6ddd8fb25ef20e8adb9a9f9b53bebf0cee3a970 (diff) | |
| download | xbmc-49fd0cd39fb22ea43bc339aba046a340cb9d7fab.tar.xz | |
Merge pull request #25106 from heitbaum/gcc-14
fix gcc-14 compile issues
| -rw-r--r-- | xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp | 1 | ||||
| -rw-r--r-- | xbmc/utils/Geometry.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp b/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp index d42c19bb2c..142974591b 100644 --- a/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp +++ b/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp @@ -17,6 +17,7 @@ #include "platform/posix/filesystem/SMBWSDiscovery.h" +#include <algorithm> #include <array> #include <chrono> #include <mutex> diff --git a/xbmc/utils/Geometry.h b/xbmc/utils/Geometry.h index 1bf4624d06..90e4275165 100644 --- a/xbmc/utils/Geometry.h +++ b/xbmc/utils/Geometry.h @@ -177,7 +177,7 @@ public: return {m_w, m_h}; } - template<class U> explicit CSizeGen<T>(const CSizeGen<U>& rhs) + template<class U> explicit CSizeGen(const CSizeGen<U>& rhs) { CheckSet(static_cast<T> (rhs.m_w), static_cast<T> (rhs.m_h)); } |