fix win platform compile

paullouisageneau · Jun 3, 2024 · 0523bcb · 0523bcb
1 parent 3b826f8
commit 0523bcb
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 15 deletions.
diff --git a/deps/json b/deps/json
diff --git a/deps/libjuice b/deps/libjuice
diff --git a/deps/libsrtp b/deps/libsrtp
diff --git a/deps/plog b/deps/plog
diff --git a/deps/usrsctp b/deps/usrsctp
diff --git a/include/rtc/av1rtppacketizer.hpp b/include/rtc/av1rtppacketizer.hpp
@@ -21,7 +21,7 @@ namespace rtc {
 class RTC_CPP_EXPORT AV1RtpPacketizer final : public RtpPacketizer {
 public:
 	// Default clock rate for AV1 in RTP
-	inline static const uint32_t defaultClockRate = 90 * 1000;
+	static const uint32_t defaultClockRate = 90 * 1000;
 
 	// Define how OBUs are seperated in a AV1 Sample
 	enum class Packetization {

diff --git a/include/rtc/h264rtppacketizer.hpp b/include/rtc/h264rtppacketizer.hpp
@@ -23,7 +23,7 @@ class RTC_CPP_EXPORT H264RtpPacketizer final : public RtpPacketizer {
 	using Separator = NalUnit::Separator;
 
 	/// Default clock rate for H264 in RTP
-	inline static const uint32_t defaultClockRate = 90 * 1000;
+	static const uint32_t defaultClockRate = 90 * 1000;
 
 	/// Constructs h264 payload packetizer with given RTP configuration.
 	/// @note RTP configuration is used in packetization process which may change some configuration

diff --git a/include/rtc/h265rtppacketizer.hpp b/include/rtc/h265rtppacketizer.hpp
@@ -22,7 +22,7 @@ class RTC_CPP_EXPORT H265RtpPacketizer final : public RtpPacketizer {
 	using Separator = NalUnit::Separator;
 
 	// Default clock rate for H265 in RTP
-	inline static const uint32_t defaultClockRate = 90 * 1000;
+	static const uint32_t defaultClockRate = 90 * 1000;
 
 	// Constructs h265 payload packetizer with given RTP configuration.
 	// @note RTP configuration is used in packetization process which may change some configuration

diff --git a/include/rtc/rtppacketizer.hpp b/include/rtc/rtppacketizer.hpp
@@ -49,8 +49,8 @@ class RTC_CPP_EXPORT RtpPacketizer : public MediaHandler {
 template <uint32_t DEFAULT_CLOCK_RATE>
 class RTC_CPP_EXPORT AudioRtpPacketizer final : public RtpPacketizer {
 public:
-	inline static const uint32_t DefaultClockRate = DEFAULT_CLOCK_RATE;
-	inline static const uint32_t defaultClockRate [[deprecated("Use DefaultClockRate")]] =
+	static const uint32_t DefaultClockRate = DEFAULT_CLOCK_RATE;
+	static const uint32_t defaultClockRate [[deprecated("Use DefaultClockRate")]] =
 	    DEFAULT_CLOCK_RATE; // for backward compatibility
 
 	AudioRtpPacketizer(shared_ptr<RtpPacketizationConfig> rtpConfig)

diff --git a/src/av1rtppacketizer.cpp b/src/av1rtppacketizer.cpp
@@ -9,7 +9,7 @@
 #if RTC_ENABLE_MEDIA
 
 #include "av1rtppacketizer.hpp"
-
+#include <algorithm>
 #include "impl/internals.hpp"
 
 namespace rtc {

diff --git a/src/h264rtppacketizer.cpp b/src/h264rtppacketizer.cpp
@@ -81,7 +81,6 @@ shared_ptr<NalUnits> H264RtpPacketizer::splitMessage(binary_ptr message) {
 	}
 	return nalus;
 }
-
 H264RtpPacketizer::H264RtpPacketizer(shared_ptr<RtpPacketizationConfig> rtpConfig,
                                      uint16_t maxFragmentSize)
     : RtpPacketizer(std::move(rtpConfig)), maxFragmentSize(maxFragmentSize),

diff --git a/src/impl/http.cpp b/src/impl/http.cpp
@@ -7,9 +7,8 @@
  */
 
 #include "http.hpp"
-
 #include <algorithm>
-
+#include <cctype>
 namespace rtc::impl {
 
 bool isHttpRequest(const byte *buffer, size_t size) {

diff --git a/src/message.cpp b/src/message.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "message.hpp"
-
+#include <algorithm>
 namespace rtc {
 
 message_ptr make_message(size_t size, Message::Type type, unsigned int stream,
+1 −0		.clang-tidy
+0 −2		.github/CONTRIBUTING.md
+0 −1		Makefile
+4 −4		README.md
+1 −1		docs/examples/at__keytype_const.c++17.cpp
+1 −1		docs/mkdocs/docs/api/basic_json/update.md
+1 −1		docs/mkdocs/docs/api/macros/json_has_static_rtti.md
+1 −1		docs/mkdocs/docs/features/arbitrary_types.md
+3 −3		docs/mkdocs/docs/features/json_pointer.md
+2 −1		include/nlohmann/detail/conversions/to_json.hpp
+2 −2		include/nlohmann/detail/input/json_sax.hpp
+1 −1		include/nlohmann/json.hpp
+5 −4		single_include/nlohmann/json.hpp
+1 −1		tests/src/unit-alt-string.cpp
+2 −2		tests/src/unit-class_parser.cpp
+2 −2		tests/src/unit-convenience.cpp
+1 −1		tests/src/unit-deserialization.cpp
+4 −4		tests/src/unit-readme.cpp
+7 −7		tests/src/unit-regression2.cpp
+29 −16		tests/src/unit-udt.cpp
+5 −5		tests/src/unit-udt_macro.cpp
+3 −3		tools/gdb_pretty_printer/nlohmann-json.py
+22 −9		CMakeLists.txt
+2 −0		cmake/LibJuiceConfig.cmake.in
+1 −0		include/juice/juice.h
+19 −0		src/juice.c
+7 −0		test/main.c
+69 −0		test/ufrag.c
+42 −9		.github/workflows/autotools.yml
+36 −2		.github/workflows/cmake.yml
+144 −0		.github/workflows/meson.yml
+1 −1		.github/workflows/stream_list.yml
+0 −462		.travis.yml
+24 −0		CHANGES
+169 −40		CMakeLists.txt
+4 −4		README.md
+10 −0		cmake/ConfigSafeGuards.cmake
+18 −0		cmake/FindwolfSSL.cmake
+19 −0		cmake/LTO.cmake
+52 −0		cmake/Sanitizer.cmake
+74 −0		cmake/Warnings.cmake
+6 −0		config_in.h
+17 −0		config_in_cmake.h
+180 −9		configure
+37 −1		configure.ac
+10 −17		crypto/cipher/aes.c
+15 −14		crypto/cipher/aes_gcm_mbedtls.c
+27 −22		crypto/cipher/aes_gcm_nss.c
+17 −16		crypto/cipher/aes_gcm_ossl.c
+478 −0		crypto/cipher/aes_gcm_wssl.c
+17 −18		crypto/cipher/aes_icm.c
+6 −6		crypto/cipher/aes_icm_mbedtls.c
+12 −10		crypto/cipher/aes_icm_nss.c
+6 −6		crypto/cipher/aes_icm_ossl.c
+390 −0		crypto/cipher/aes_icm_wssl.c
+47 −51		crypto/cipher/cipher.c
+5 −5		crypto/cipher/null_cipher.c
+8 −7		crypto/hash/auth.c
+12 −13		crypto/hash/hmac.c
+24 −17		crypto/hash/hmac_mbedtls.c
+14 −13		crypto/hash/hmac_nss.c
+23 −18		crypto/hash/hmac_ossl.c
+228 −0		crypto/hash/hmac_wssl.c
+8 −8		crypto/hash/null_auth.c
+7 −7		crypto/hash/sha1.c
+3 −3		crypto/include/aes.h
+35 −8		crypto/include/aes_gcm.h
+2 −2		crypto/include/aes_icm.h
+15 −3		crypto/include/aes_icm_ext.h
+18 −18		crypto/include/auth.h
+30 −30		crypto/include/cipher.h
+1 −1		crypto/include/cipher_priv.h
+1 −1		crypto/include/cipher_types.h
+6 −6		crypto/include/crypto_kernel.h
+48 −31		crypto/include/datatypes.h
+1 −1		crypto/include/err.h
+0 −146		crypto/include/integers.h
+0 −1		crypto/include/rdb.h
+9 −9		crypto/include/rdbx.h
+2 −2		crypto/include/sha1.h
+3 −9		crypto/kernel/alloc.c
+15 −14		crypto/kernel/crypto_kernel.c
+2 −26		crypto/kernel/key.c
+261 −39		crypto/math/datatypes.c
+3 −2		crypto/replay/rdb.c
+16 −64		crypto/replay/rdbx.c
+14 −12		crypto/test/aes_calc.c
+116 −90		crypto/test/cipher_driver.c
+25 −21		crypto/test/datatypes_driver.c
+4 −9		crypto/test/env.c
+8 −4		crypto/test/kernel_driver.c
+2 −2		crypto/test/meson.build
+25 −19		crypto/test/sha1_driver.c
+1 −1		doc/Makefile.in
+17 −19		doc/crypto_kernel.txt
+28 −96		fuzzer/fuzzer.c
+18 −67		fuzzer/fuzzer.h
+104 −368		include/srtp.h
+6 −33		include/srtp_priv.h
+2 −3		include/stream_list_priv.h
+51 −2		meson.build
+2 −2		meson_options.txt
+6 −14		srtp.def
+959 −932		srtp/srtp.c
+27 −14		test/cutest.h
+5 −3		test/getopt_s.c
+1 −1		test/meson.build
+45 −36		test/rdbx_driver.c
+29 −21		test/replay_driver.c
+17 −12		test/roc_driver.c
+35 −29		test/rtp.c
+16 −32		test/rtp.h
+84 −85		test/rtp_decoder.c
+10 −10		test/rtp_decoder.h
+44 −38		test/rtpw.c
+908 −593		test/srtp_driver.c
+4 −1		test/ut_sim.c
+1 −1		test/ut_sim.h
+19 −17		test/util.c
+9 −3		test/util.h
+3 −5		.cirrus.yml
+11 −4		.github/workflows/ci.yml
+5 −1		CMakeLists.txt
+40 −10		include/plog/Record.h
+5 −1		samples/CMakeLists.txt
+5 −1		samples/CXX11/CMakeLists.txt
+5 −1		samples/CXX17/CMakeLists.txt
+2 −1		samples/Demo/CMakeLists.txt
+140 −8		test/CMakeLists.txt
+55 −0		test/CastToString.cpp
+16 −0		test/Common.h
+2 −4		test/Conditional.cpp
+1 −1		test/Main.cpp
+86 −0		test/NullCharPointer.cpp
+27 −0		test/Path.cpp
+15 −17		test/Printf.cpp
+1 −3		test/SimpleTypes.cpp
+42 −24		test/StdContainers.cpp
+11 −13		test/StdManipulators.cpp
+69 −0		test/StdStreamable.cpp
+53 −3		test/StringTypes.cpp
+0 −0		test/doctest/1.2.9/doctest.h
+7,106 −0		test/doctest/2.4.11/doctest.h
+3 −3		Manual.md
+12 −1		configure.ac
+1 −1		usrsctplib/netinet/sctp_header.h
+20 −14		usrsctplib/netinet/sctp_indata.c
+5 −3		usrsctplib/netinet/sctp_input.c
+65 −37		usrsctplib/netinet/sctp_output.c
+3 −1		usrsctplib/netinet/sctp_output.h
+9 −7		usrsctplib/netinet/sctp_pcb.c
+6 −6		usrsctplib/netinet/sctp_pcb.h
+3 −1		usrsctplib/netinet/sctp_usrreq.c
+13 −11		usrsctplib/netinet/sctputil.c
+11 −1		usrsctplib/user_socketvar.h