From fbf783450c181df9ab5c56cfe3a1793caa951908 Mon Sep 17 00:00:00 2001 From: Junxiao Shi Date: Fri, 23 Jan 2015 14:46:41 -0700 Subject: [PATCH] rib+tools: subscribe to FaceMonitor notifications using connect refs #2350 Change-Id: I1b1b33cdcc3638c7344b6c690f928aff25aa5c8c --- rib/rib-manager.cpp | 2 +- tools/nfd-autoreg.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rib/rib-manager.cpp b/rib/rib-manager.cpp index ae64820e..e577626a 100644 --- a/rib/rib-manager.cpp +++ b/rib/rib-manager.cpp @@ -126,7 +126,7 @@ RibManager::registerWithNfd() } NFD_LOG_INFO("Start monitoring face create/destroy events"); - m_faceMonitor.onNotification += bind(&RibManager::onNotification, this, _1); + m_faceMonitor.onNotification.connect(bind(&RibManager::onNotification, this, _1)); m_faceMonitor.start(); scheduleActiveFaceFetch(ACTIVE_FACE_FETCH_INTERVAL); diff --git a/tools/nfd-autoreg.cpp b/tools/nfd-autoreg.cpp index 0ad68411..c6de1f50 100644 --- a/tools/nfd-autoreg.cpp +++ b/tools/nfd-autoreg.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. @@ -234,7 +234,7 @@ public: std::cout << " " << *network << std::endl; } - m_faceMonitor.onNotification += bind(&AutoregServer::onNotification, this, _1); + m_faceMonitor.onNotification.connect(bind(&AutoregServer::onNotification, this, _1)); m_faceMonitor.start(); boost::asio::signal_set signalSet(m_face.getIoService(), SIGINT, SIGTERM);