zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use suffixed {uint,int}{8,16,32,64}_t types.

Browse Source 
Removes the use of uint8, etc. in favor of uint8_t.

BUG=webrtc:5024
R=henrik.lundin@webrtc.org, henrikg@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org

Review URL: https://codereview.webrtc.org/1362503003 .

Cr-Commit-Position: refs/heads/master@{#10196}
This commit is contained in:
Peter Boström
2015-10-07 12:23:21 +02:00
parent 8d15bd6dab
commit 0c4e06b4c6
339 changed files with 4023 additions and 3764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
webrtc/base/messagequeue.h
View File

@ -123,8 +123,8 @@ class DisposeData : public MessageData {
T* data_;
};
const uint32 MQID_ANY = static_cast<uint32>(-1);
const uint32 MQID_DISPOSE = static_cast<uint32>(-2);
const uint32_t MQID_ANY = static_cast<uint32_t>(-1);
const uint32_t MQID_DISPOSE = static_cast<uint32_t>(-2);
// No destructor
@ -132,14 +132,14 @@ struct Message {
Message() {
memset(this, 0, sizeof(*this));
}
inline bool Match(MessageHandler* handler, uint32 id) const {
inline bool Match(MessageHandler* handler, uint32_t id) const {
return (handler == NULL || handler == phandler)
&& (id == MQID_ANY || id == message_id);
}
MessageHandler *phandler;
uint32 message_id;
uint32_t message_id;
MessageData *pdata;
uint32 ts_sensitive;
uint32_t ts_sensitive;
};
typedef std::list<Message> MessageList;
@ -149,8 +149,8 @@ typedef std::list<Message> MessageList;
class DelayedMessage {
public:
DelayedMessage(int delay, uint32 trigger, uint32 num, const Message& msg)
: cmsDelay_(delay), msTrigger_(trigger), num_(num), msg_(msg) { }
DelayedMessage(int delay, uint32_t trigger, uint32_t num, const Message& msg)
: cmsDelay_(delay), msTrigger_(trigger), num_(num), msg_(msg) {}
bool operator< (const DelayedMessage& dmsg) const {
return (dmsg.msTrigger_ < msTrigger_)
@ -158,8 +158,8 @@ class DelayedMessage {
}
int cmsDelay_; // for debugging
uint32 msTrigger_;
uint32 num_;
uint32_t msTrigger_;
uint32_t num_;
Message msg_;
};
@ -190,17 +190,20 @@ class MessageQueue {
virtual bool Get(Message *pmsg, int cmsWait = kForever,
bool process_io = true);
virtual bool Peek(Message *pmsg, int cmsWait = 0);
virtual void Post(MessageHandler *phandler, uint32 id = 0,
MessageData *pdata = NULL, bool time_sensitive = false);
virtual void Post(MessageHandler* phandler,
uint32_t id = 0,
MessageData* pdata = NULL,
bool time_sensitive = false);
virtual void PostDelayed(int cmsDelay,
MessageHandler* phandler,
uint32 id = 0,
uint32_t id = 0,
MessageData* pdata = NULL);
virtual void PostAt(uint32 tstamp,
virtual void PostAt(uint32_t tstamp,
MessageHandler* phandler,
uint32 id = 0,
uint32_t id = 0,
MessageData* pdata = NULL);
virtual void Clear(MessageHandler *phandler, uint32 id = MQID_ANY,
virtual void Clear(MessageHandler* phandler,
uint32_t id = MQID_ANY,
MessageList* removed = NULL);
virtual void Dispatch(Message *pmsg);
virtual void ReceiveSends();
@ -232,8 +235,11 @@ class MessageQueue {
void reheap() { make_heap(c.begin(), c.end(), comp); }
};
void DoDelayPost(int cmsDelay, uint32 tstamp, MessageHandler *phandler,
uint32 id, MessageData* pdata);
void DoDelayPost(int cmsDelay,
uint32_t tstamp,
MessageHandler* phandler,
uint32_t id,
MessageData* pdata);
// The SocketServer is not owned by MessageQueue.
SocketServer* ss_;
@ -244,7 +250,7 @@ class MessageQueue {
Message msgPeek_;
MessageList msgq_;
PriorityQueue dmsgq_;
uint32 dmsgq_next_num_;
uint32_t dmsgq_next_num_;
mutable CriticalSection crit_;
private: