| Index: net/tools/flip_server/output_ordering.cc
|
| diff --git a/net/tools/flip_server/output_ordering.cc b/net/tools/flip_server/output_ordering.cc
|
| index 9659954f48b36943534716a42003e7ded622bfaa..fb867050c2f38255e1f02d874d4185b2393579f2 100644
|
| --- a/net/tools/flip_server/output_ordering.cc
|
| +++ b/net/tools/flip_server/output_ordering.cc
|
| @@ -12,9 +12,11 @@
|
| namespace net {
|
|
|
| OutputOrdering::PriorityMapPointer::PriorityMapPointer()
|
| - : ring(NULL), alarm_enabled(false) {}
|
| + : ring(NULL), alarm_enabled(false) {
|
| +}
|
|
|
| -OutputOrdering::PriorityMapPointer::~PriorityMapPointer() {}
|
| +OutputOrdering::PriorityMapPointer::~PriorityMapPointer() {
|
| +}
|
|
|
| // static
|
| double OutputOrdering::server_think_time_in_s_ = 0.0;
|
| @@ -26,7 +28,9 @@ OutputOrdering::OutputOrdering(SMConnectionInterface* connection)
|
| epoll_server_ = connection->epoll_server();
|
| }
|
|
|
| -OutputOrdering::~OutputOrdering() { Reset(); }
|
| +OutputOrdering::~OutputOrdering() {
|
| + Reset();
|
| +}
|
|
|
| void OutputOrdering::Reset() {
|
| while (!stream_ids_.empty()) {
|
| @@ -50,7 +54,8 @@ OutputOrdering::BeginOutputtingAlarm::BeginOutputtingAlarm(
|
| OutputOrdering* oo,
|
| OutputOrdering::PriorityMapPointer* pmp,
|
| const MemCacheIter& mci)
|
| - : output_ordering_(oo), pmp_(pmp), mci_(mci), epoll_server_(NULL) {}
|
| + : output_ordering_(oo), pmp_(pmp), mci_(mci), epoll_server_(NULL) {
|
| +}
|
|
|
| OutputOrdering::BeginOutputtingAlarm::~BeginOutputtingAlarm() {
|
| if (epoll_server_ && pmp_->alarm_enabled)
|
|
|