common: Remove extra ; from end of namespaces

This was correctly giving warnings with GCC --pedantic
This commit is contained in:
Joni Räsänen 2022-02-28 08:46:04 +02:00
parent f62ade9c70
commit 3437e194aa
38 changed files with 82 additions and 82 deletions

View File

@ -45,7 +45,7 @@ namespace uvgrtp {
* \return Difference of the timestamps in milliseconds * \return Difference of the timestamps in milliseconds
*/ */
uint64_t diff_now(uint64_t then); uint64_t diff_now(uint64_t then);
}; }
/// \cond DO_NOT_DOCUMENT /// \cond DO_NOT_DOCUMENT
/* high-resolution clock */ /* high-resolution clock */
@ -61,7 +61,7 @@ namespace uvgrtp {
uint64_t diff_now(hrc_t then); uint64_t diff_now(hrc_t then);
uint64_t diff_now_us(hrc_t& then); uint64_t diff_now_us(hrc_t& then);
}; }
uint64_t ms_to_jiffies(uint64_t ms); uint64_t ms_to_jiffies(uint64_t ms);
uint64_t jiffies_to_ms(uint64_t jiffies); uint64_t jiffies_to_ms(uint64_t jiffies);
@ -70,7 +70,7 @@ namespace uvgrtp {
int gettimeofday(struct timeval *tp, struct timezone *tzp); int gettimeofday(struct timeval *tp, struct timezone *tzp);
#endif #endif
/// \endcond /// \endcond
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -80,7 +80,7 @@ namespace uvgrtp {
CryptoPP::HMAC<CryptoPP::SHA256> hmac_; CryptoPP::HMAC<CryptoPP::SHA256> hmac_;
#endif #endif
}; };
}; }
class sha256 { class sha256 {
public: public:
@ -142,7 +142,7 @@ namespace uvgrtp {
CryptoPP::CTR_Mode<CryptoPP::AES>::Decryption dec_; CryptoPP::CTR_Mode<CryptoPP::AES>::Decryption dec_;
#endif #endif
}; };
}; }
/* diffie-hellman key derivation, 3072-bits */ /* diffie-hellman key derivation, 3072-bits */
class dh { class dh {
@ -186,16 +186,16 @@ namespace uvgrtp {
namespace random { namespace random {
void generate_random(uint8_t *out, size_t len); void generate_random(uint8_t *out, size_t len);
}; }
namespace crc32 { namespace crc32 {
void get_crc32(uint8_t *input, size_t len, uint32_t *output); void get_crc32(uint8_t *input, size_t len, uint32_t *output);
bool verify_crc32(uint8_t *input, size_t len, uint32_t old_crc); bool verify_crc32(uint8_t *input, size_t len, uint32_t old_crc);
uint32_t calculate_crc32(uint8_t *input, size_t len); uint32_t calculate_crc32(uint8_t *input, size_t len);
}; }
bool enabled(); bool enabled();
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -199,7 +199,7 @@ namespace uvgrtp {
* Return RTP_OK on successs * Return RTP_OK on successs
* Return RTP_INVALID_VALUE if "frame" is nullptr */ * Return RTP_INVALID_VALUE if "frame" is nullptr */
rtp_error_t dealloc_frame(uvgrtp::frame::zrtp_frame *frame); rtp_error_t dealloc_frame(uvgrtp::frame::zrtp_frame *frame);
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -91,6 +91,6 @@ namespace uvgrtp {
/* CNAME is the same for all connections */ /* CNAME is the same for all connections */
std::string cname_; std::string cname_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -29,11 +29,11 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct rtp_frame; struct rtp_frame;
}; }
namespace formats { namespace formats {
class media; class media;
}; }
class media_stream { class media_stream {
public: public:
@ -351,6 +351,6 @@ namespace uvgrtp {
/* Thread that keeps the holepunched connection open for unidirectional streams */ /* Thread that keeps the holepunched connection open for unidirectional streams */
uvgrtp::holepuncher *holepuncher_; uvgrtp::holepuncher *holepuncher_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -457,6 +457,6 @@ namespace uvgrtp {
bool active_; bool active_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -19,6 +19,6 @@ namespace uvgrtp {
bool active_; bool active_;
std::thread *runner_; std::thread *runner_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -87,6 +87,6 @@ namespace uvgrtp {
std::mutex session_mtx_; std::mutex session_mtx_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -164,6 +164,6 @@ namespace uvgrtp {
struct iovec chunks_[MAX_BUFFER_COUNT]; struct iovec chunks_[MAX_BUFFER_COUNT];
#endif #endif
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -84,6 +84,6 @@ namespace uvgrtp {
uvgrtp::socket *socket_; uvgrtp::socket *socket_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -71,7 +71,7 @@ namespace uvgrtp {
private: private:
h264_aggregation_packet aggr_pkt_info_; h264_aggregation_packet aggr_pkt_info_;
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -67,7 +67,7 @@ namespace uvgrtp {
private: private:
h265_aggregation_packet aggr_pkt_info_; h265_aggregation_packet aggr_pkt_info_;
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -55,7 +55,7 @@ namespace uvgrtp {
virtual int get_fragment_type(uvgrtp::frame::rtp_frame* frame) const; virtual int get_fragment_type(uvgrtp::frame::rtp_frame* frame) const;
virtual uvgrtp::formats::NAL_TYPES get_nal_type(uvgrtp::frame::rtp_frame* frame) const; virtual uvgrtp::formats::NAL_TYPES get_nal_type(uvgrtp::frame::rtp_frame* frame) const;
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -163,7 +163,7 @@ namespace uvgrtp {
uvgrtp::clock::hrc::hrc_t last_garbage_collection_; uvgrtp::clock::hrc::hrc_t last_garbage_collection_;
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -15,7 +15,7 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct rtp_frame; struct rtp_frame;
}; }
namespace formats { namespace formats {
@ -73,7 +73,7 @@ namespace uvgrtp {
private: private:
media_frame_info_t minfo_; media_frame_info_t minfo_;
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -33,6 +33,6 @@ namespace uvgrtp {
uvgrtp::socket *socket_; uvgrtp::socket *socket_;
std::atomic<uint64_t> last_dgram_sent_; std::atomic<uint64_t> last_dgram_sent_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -6,7 +6,7 @@ namespace uvgrtp {
namespace hostname { namespace hostname {
std::string get_hostname(); std::string get_hostname();
std::string get_username(); std::string get_username();
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -7,7 +7,7 @@
namespace uvgrtp { namespace uvgrtp {
namespace mingw { namespace mingw {
int inet_pton(int af, const char *src, struct in_addr *dst); int inet_pton(int af, const char *src, struct in_addr *dst);
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -7,7 +7,7 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct rtp_frame; struct rtp_frame;
}; }
const int MULTICAST_MAX_PEERS = 64; const int MULTICAST_MAX_PEERS = 64;
@ -32,6 +32,6 @@ namespace uvgrtp {
rtp_format_t fmt, uint32_t timestamp rtp_format_t fmt, uint32_t timestamp
); );
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -15,7 +15,7 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct rtp_frame; struct rtp_frame;
}; }
class socket; class socket;

View File

@ -20,7 +20,7 @@ namespace uvgrtp {
/* TODO: */ /* TODO: */
rtp_error_t blocked_recv(uvgrtp::socket *socket, uint8_t *buf, size_t buf_len, int timeout, int *bytes_read); rtp_error_t blocked_recv(uvgrtp::socket *socket, uint8_t *buf, size_t buf_len, int timeout, int *bytes_read);
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -220,6 +220,6 @@ namespace uvgrtp {
/* RTP context flags */ /* RTP context flags */
int flags_; int flags_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -14,7 +14,7 @@ namespace uvgrtp {
int generate(void *buf, size_t n); int generate(void *buf, size_t n);
uint32_t generate_32(); uint32_t generate_32();
uint64_t generate_64(); uint64_t generate_64();
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -8,7 +8,7 @@ namespace uvgrtp {
namespace frame namespace frame
{ {
struct rtp_frame; struct rtp_frame;
}; }
class rtp { class rtp {
public: public:
@ -68,6 +68,6 @@ namespace uvgrtp {
* Default value is 100ms */ * Default value is 100ms */
size_t delay_; size_t delay_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -179,6 +179,6 @@ namespace uvgrtp {
* Used to implement replay protection */ * Used to implement replay protection */
std::unordered_set<uint64_t> replay_list_; std::unordered_set<uint64_t> replay_list_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -32,6 +32,6 @@ namespace uvgrtp {
rtp_error_t add_auth_tag(uint8_t* buffer, size_t len); rtp_error_t add_auth_tag(uint8_t* buffer, size_t len);
rtp_error_t verify_auth_tag(uint8_t* buffer, size_t len); rtp_error_t verify_auth_tag(uint8_t* buffer, size_t len);
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -6,7 +6,7 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct rtp_frame; struct rtp_frame;
}; }
class srtp : public base_srtp { class srtp : public base_srtp {
public: public:
@ -33,6 +33,6 @@ namespace uvgrtp {
bool authenticate_rtp_; bool authenticate_rtp_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -21,24 +21,24 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct rtp_frame; struct rtp_frame;
}; }
namespace crypto namespace crypto
{ {
namespace hmac { namespace hmac {
class sha256; class sha256;
}; }
class sha256; class sha256;
class dh; class dh;
}; }
namespace zrtp_msg { namespace zrtp_msg {
struct zrtp_hello_ack; struct zrtp_hello_ack;
struct zrtp_commit; struct zrtp_commit;
struct zrtp_hello; struct zrtp_hello;
struct zrtp_dh; struct zrtp_dh;
}; }
enum ZRTP_ROLE { enum ZRTP_ROLE {
INITIATOR, INITIATOR,
@ -318,6 +318,6 @@ namespace uvgrtp {
std::mutex zrtp_mtx_; std::mutex zrtp_mtx_;
}; };
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -50,7 +50,7 @@ namespace uvgrtp {
/* TODO: */ /* TODO: */
virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver, zrtp_session_t& session); virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver, zrtp_session_t& session);
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -14,7 +14,7 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct zrtp_frame; struct zrtp_frame;
}; }
typedef struct zrtp_session zrtp_session_t; typedef struct zrtp_session zrtp_session_t;
@ -34,7 +34,7 @@ namespace uvgrtp {
virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver, virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver,
zrtp_session_t& session); zrtp_session_t& session);
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -17,7 +17,7 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct zrtp_frame; struct zrtp_frame;
}; }
namespace zrtp_msg { namespace zrtp_msg {
@ -55,7 +55,7 @@ namespace uvgrtp {
/* TODO: */ /* TODO: */
virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver, zrtp_session_t& session); virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver, zrtp_session_t& session);
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -130,7 +130,7 @@ namespace uvgrtp {
ZRTP_ERR_PROTOCOL_TIMEOUT = 0xB0, /* Protocol timeout error */ ZRTP_ERR_PROTOCOL_TIMEOUT = 0xB0, /* Protocol timeout error */
ZRTP_ERR_GOCLEAR_NOT_ALLOWED = 0x100, /* Goclear received but not supported */ ZRTP_ERR_GOCLEAR_NOT_ALLOWED = 0x100, /* Goclear received but not supported */
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -17,7 +17,7 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct zrtp_frame; struct zrtp_frame;
}; }
namespace zrtp_msg { namespace zrtp_msg {
@ -45,7 +45,7 @@ namespace uvgrtp {
virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver, zrtp_session_t& session); virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver, zrtp_session_t& session);
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -15,7 +15,7 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct zrtp_frame; struct zrtp_frame;
}; }
namespace zrtp_msg { namespace zrtp_msg {
@ -36,7 +36,7 @@ namespace uvgrtp {
zrtp_session_t& session); zrtp_session_t& session);
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -18,7 +18,7 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct zrtp_frame; struct zrtp_frame;
}; }
namespace zrtp_msg { namespace zrtp_msg {
@ -64,7 +64,7 @@ namespace uvgrtp {
/* TODO: */ /* TODO: */
virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver, zrtp_session_t& session); virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver, zrtp_session_t& session);
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -15,7 +15,7 @@ namespace uvgrtp {
namespace frame { namespace frame {
struct zrtp_frame; struct zrtp_frame;
}; }
namespace zrtp_msg { namespace zrtp_msg {
@ -35,7 +35,7 @@ namespace uvgrtp {
zrtp_session_t& session); zrtp_session_t& session);
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -37,8 +37,8 @@ namespace uvgrtp {
size_t len_; size_t len_;
size_t rlen_; size_t rlen_;
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;

View File

@ -45,7 +45,7 @@ namespace uvgrtp {
size_t len_; size_t len_;
size_t rlen_; size_t rlen_;
}; };
}; }
}; }
namespace uvg_rtp = uvgrtp; namespace uvg_rtp = uvgrtp;