| Index: webrtc/modules/rtp_rtcp/source/ssrc_database.h
|
| diff --git a/webrtc/modules/rtp_rtcp/source/ssrc_database.h b/webrtc/modules/rtp_rtcp/source/ssrc_database.h
|
| index 7129d0de766e52303ecd739937e58d20b3cc3251..5e52f07528d085872f6585ca5e5162c7b0b429a8 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/ssrc_database.h
|
| +++ b/webrtc/modules/rtp_rtcp/source/ssrc_database.h
|
| @@ -19,35 +19,34 @@
|
| namespace webrtc {
|
| class CriticalSectionWrapper;
|
|
|
| -class SSRCDatabase
|
| -{
|
| -public:
|
| - static SSRCDatabase* GetSSRCDatabase();
|
| - static void ReturnSSRCDatabase();
|
| +class SSRCDatabase {
|
| + public:
|
| + static SSRCDatabase* GetSSRCDatabase();
|
| + static void ReturnSSRCDatabase();
|
|
|
| - uint32_t CreateSSRC();
|
| - int32_t RegisterSSRC(const uint32_t ssrc);
|
| - int32_t ReturnSSRC(const uint32_t ssrc);
|
| + uint32_t CreateSSRC();
|
| + int32_t RegisterSSRC(const uint32_t ssrc);
|
| + int32_t ReturnSSRC(const uint32_t ssrc);
|
|
|
| -protected:
|
| - SSRCDatabase();
|
| - virtual ~SSRCDatabase();
|
| + protected:
|
| + SSRCDatabase();
|
| + virtual ~SSRCDatabase();
|
|
|
| - static SSRCDatabase* CreateInstance() { return new SSRCDatabase(); }
|
| + static SSRCDatabase* CreateInstance() { return new SSRCDatabase(); }
|
|
|
| -private:
|
| - // Friend function to allow the SSRC destructor to be accessed from the
|
| - // template class.
|
| - friend SSRCDatabase* GetStaticInstance<SSRCDatabase>(
|
| - CountOperation count_operation);
|
| - static SSRCDatabase* StaticInstance(CountOperation count_operation);
|
| + private:
|
| + // Friend function to allow the SSRC destructor to be accessed from the
|
| + // template class.
|
| + friend SSRCDatabase* GetStaticInstance<SSRCDatabase>(
|
| + CountOperation count_operation);
|
| + static SSRCDatabase* StaticInstance(CountOperation count_operation);
|
|
|
| - uint32_t GenerateRandom();
|
| + uint32_t GenerateRandom();
|
|
|
| - std::map<uint32_t, uint32_t> _ssrcMap;
|
| + std::map<uint32_t, uint32_t> _ssrcMap;
|
|
|
| - CriticalSectionWrapper* _critSect;
|
| + CriticalSectionWrapper* _critSect;
|
| };
|
| } // namespace webrtc
|
|
|
| -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_SSRC_DATABASE_H_
|
| +#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_SSRC_DATABASE_H_
|
|
|