commit 1e46be30e43b598bf8d132ca86d31f5d2e433cfb
author Junxiao Shi <git@mail1.yoursunny.com> Thu Jan 08 20:18:05 2015 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Fri Jan 09 09:52:56 2015 -0700
tree dd50951e38c28118f7f334934f61c3bd78275d71
parent 767cb336328369e9903818d8faae9da5bca83cc4

core: rename nfd::EventId to nfd::scheduler::EventId

refs #2298

Change-Id: I5d4f4c5234fd370666e81a8a8e7d312694a6ad5d

daemon/face/websocket-channel.cpp

diff --git a/daemon/face/websocket-channel.cpp b/daemon/face/websocket-channel.cpp
index 8abdbac..016dcac 100644
--- a/daemon/face/websocket-channel.cpp
+++ b/daemon/face/websocket-channel.cpp
@@ -1,12 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014,  Regents of the University of California,
- *                      Arizona Board of Regents,
- *                      Colorado State University,
- *                      University Pierre & Marie Curie, Sorbonne University,
- *                      Washington University in St. Louis,
- *                      Beijing Institute of Technology,
- *                      The University of Memphis
+ * Copyright (c) 2014-2015,  Regents of the University of California,
+ *                           Arizona Board of Regents,
+ *                           Colorado State University,
+ *                           University Pierre & Marie Curie, Sorbonne University,
+ *                           Washington University in St. Louis,
+ *                           Beijing Institute of Technology,
+ *                           The University of Memphis.
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -120,8 +120,8 @@
   m_channelFaces[hdl] = face;
 
   // Schedule PING message
-  EventId pingEvent = scheduler::schedule(m_pingInterval,
-                                          bind(&WebSocketChannel::sendPing, this, hdl));
+  scheduler::EventId pingEvent = scheduler::schedule(m_pingInterval,
+                                                     bind(&WebSocketChannel::sendPing, this, hdl));
   face->setPingEventId(pingEvent);
 }
 
@@ -145,8 +145,8 @@
       NFD_LOG_TRACE("sendPing: to " << it->second->getRemoteUri());
 
       // Schedule next PING message
-      EventId pingEvent = scheduler::schedule(m_pingInterval,
-                                              bind(&WebSocketChannel::sendPing, this, hdl));
+      scheduler::EventId pingEvent = scheduler::schedule(m_pingInterval,
+                                         bind(&WebSocketChannel::sendPing, this, hdl));
       it->second->setPingEventId(pingEvent);
     }
 }