common: remove DECL_FINAL/OVERRIDE macros; use C++11 keywords directly
Change-Id: I71a148b0df7c95387b2caa8e2b9fe93b03ca2399
Refs: #3599
diff --git a/.waf-tools/compiler-features.py b/.waf-tools/compiler-features.py
index 8fa6aa7..27aa34b 100644
--- a/.waf-tools/compiler-features.py
+++ b/.waf-tools/compiler-features.py
@@ -1,63 +1,30 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+"""
+Copyright (c) 2014-2016, 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.
+
+NFD is free software: you can redistribute it and/or modify it under the terms
+of the GNU General Public License as published by the Free Software Foundation,
+either version 3 of the License, or (at your option) any later version.
+
+NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+"""
+
from waflib.Configure import conf
-OVERRIDE = '''
-class Base
-{
- virtual void
- f(int a);
-};
-
-class Derived : public Base
-{
- virtual void
- f(int a) override;
-};
-'''
-
-@conf
-def check_override(self):
- self.check_cxx(msg='Checking for override specifier',
- fragment=OVERRIDE,
- define_name='HAVE_CXX_OVERRIDE',
- features='cxx', mandatory=False)
-
-FINAL = '''
-class Base
-{
- virtual void
- f(int a);
-};
-
-class Derived : public Base
-{
- virtual void
- f(int a) final;
-};
-'''
-
-@conf
-def check_final(self):
- self.check_cxx(msg='Checking for final specifier on method',
- fragment=FINAL,
- define_name='HAVE_CXX_FINAL',
- features='cxx', mandatory=False)
-
-CLASS_FINAL = '''
-class A final
-{
-};
-'''
-
-@conf
-def check_class_final(self):
- self.check_cxx(msg='Checking for final specifier on class',
- fragment=CLASS_FINAL,
- define_name='HAVE_CXX_CLASS_FINAL',
- features='cxx', mandatory=False)
-
def configure(conf):
- conf.check_override()
- conf.check_final()
- conf.check_class_final()
+ pass
diff --git a/common.hpp b/common.hpp
index c64dd37..a36852b 100644
--- a/common.hpp
+++ b/common.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -40,36 +40,6 @@
#define PROTECTED_WITH_TESTS_ELSE_PRIVATE private
#endif
-/** \def DECL_OVERRIDE
- * \brief expands to 'override' if compiler supports 'override' specifier,
- * otherwise expands to nothing
- */
-#ifdef HAVE_CXX_OVERRIDE
-#define DECL_OVERRIDE override
-#else
-#define DECL_OVERRIDE
-#endif
-
-/** \def DECL_FINAL
- * \brief expands to 'final' if compiler supports 'final' specifier on method,
- * otherwise expands to nothing
- */
-#ifdef HAVE_CXX_FINAL
-#define DECL_FINAL final
-#else
-#define DECL_FINAL
-#endif
-
-/** \def DECL_CLASS_FINAL
- * \brief expands to 'final' if compiler supports 'final' specifier on class,
- * otherwise expands to nothing
- */
-#ifdef HAVE_CXX_CLASS_FINAL
-#define DECL_CLASS_FINAL final
-#else
-#define DECL_CLASS_FINAL
-#endif
-
#include <cstddef>
#include <cstdint>
#include <functional>
diff --git a/daemon/face/datagram-transport.hpp b/daemon/face/datagram-transport.hpp
index 069a9ba..2f76353 100644
--- a/daemon/face/datagram-transport.hpp
+++ b/daemon/face/datagram-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -62,10 +62,10 @@
protected:
virtual void
- doClose() DECL_OVERRIDE;
+ doClose() override;
virtual void
- doSend(Transport::Packet&& packet) DECL_OVERRIDE;
+ doSend(Transport::Packet&& packet) override;
void
handleSend(const boost::system::error_code& error,
diff --git a/daemon/face/ethernet-factory.hpp b/daemon/face/ethernet-factory.hpp
index add176e..b44c2b7 100644
--- a/daemon/face/ethernet-factory.hpp
+++ b/daemon/face/ethernet-factory.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -80,10 +80,10 @@
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
const FaceCreatedCallback& onCreated,
- const FaceCreationFailedCallback& onConnectFailed) DECL_OVERRIDE;
+ const FaceCreationFailedCallback& onConnectFailed) override;
virtual std::vector<shared_ptr<const Channel>>
- getChannels() const DECL_OVERRIDE;
+ getChannels() const override;
private:
/**
diff --git a/daemon/face/ethernet-transport.hpp b/daemon/face/ethernet-transport.hpp
index 1d41008..348cabf 100644
--- a/daemon/face/ethernet-transport.hpp
+++ b/daemon/face/ethernet-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -45,7 +45,7 @@
/**
* \brief A multicast Transport that uses raw Ethernet II frames
*/
-class EthernetTransport DECL_CLASS_FINAL : public Transport
+class EthernetTransport final : public Transport
{
public:
class Error : public std::runtime_error
@@ -66,14 +66,14 @@
protected:
virtual void
- beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) DECL_FINAL;
+ beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) final;
virtual void
- doClose() DECL_FINAL;
+ doClose() final;
private:
virtual void
- doSend(Transport::Packet&& packet) DECL_FINAL;
+ doSend(Transport::Packet&& packet) final;
/**
* @brief Allocates and initializes a libpcap context for live capture
diff --git a/daemon/face/face.hpp b/daemon/face/face.hpp
index 2b56fec..2dccbd1 100644
--- a/daemon/face/face.hpp
+++ b/daemon/face/face.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -66,7 +66,7 @@
*/
class Face
#ifndef WITH_TESTS
-DECL_CLASS_FINAL
+final
#endif
: public enable_shared_from_this<Face>, noncopyable
{
diff --git a/daemon/face/generic-link-service.hpp b/daemon/face/generic-link-service.hpp
index 8afc693..dde6990 100644
--- a/daemon/face/generic-link-service.hpp
+++ b/daemon/face/generic-link-service.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -127,23 +127,23 @@
setOptions(const Options& options);
virtual const Counters&
- getCounters() const DECL_OVERRIDE;
+ getCounters() const override;
private: // send path
/** \brief send Interest
*/
void
- doSendInterest(const Interest& interest) DECL_OVERRIDE;
+ doSendInterest(const Interest& interest) override;
/** \brief send Data
*/
void
- doSendData(const Data& data) DECL_OVERRIDE;
+ doSendData(const Data& data) override;
/** \brief send Nack
*/
void
- doSendNack(const ndn::lp::Nack& nack) DECL_OVERRIDE;
+ doSendNack(const ndn::lp::Nack& nack) override;
/** \brief encode local fields from tags onto outgoing LpPacket
* \param pkt LpPacket containing a complete network layer packet
@@ -171,7 +171,7 @@
/** \brief receive Packet from Transport
*/
void
- doReceivePacket(Transport::Packet&& packet) DECL_OVERRIDE;
+ doReceivePacket(Transport::Packet&& packet) override;
/** \brief decode incoming network-layer packet
* \param netPkt reassembled network-layer packet
diff --git a/daemon/face/internal-transport.hpp b/daemon/face/internal-transport.hpp
index 53bd379..61a12e7 100644
--- a/daemon/face/internal-transport.hpp
+++ b/daemon/face/internal-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -59,18 +59,18 @@
ndn::nfd::LinkType linkType = ndn::nfd::LINK_TYPE_POINT_TO_POINT);
virtual void
- receiveFromLink(const Block& packet) DECL_OVERRIDE;
+ receiveFromLink(const Block& packet) override;
protected:
virtual void
- beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) DECL_OVERRIDE;
+ beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) override;
virtual void
- doClose() DECL_OVERRIDE;
+ doClose() override;
private:
virtual void
- doSend(Packet&& packet) DECL_OVERRIDE;
+ doSend(Packet&& packet) override;
private:
NFD_LOG_INCLASS_DECLARE();
@@ -93,28 +93,28 @@
connectToForwarder(InternalForwarderTransport* forwarderTransport);
virtual void
- receiveFromLink(const Block& packet) DECL_OVERRIDE;
+ receiveFromLink(const Block& packet) override;
virtual void
- close() DECL_OVERRIDE
+ close() override
{
}
virtual void
- pause() DECL_OVERRIDE
+ pause() override
{
}
virtual void
- resume() DECL_OVERRIDE
+ resume() override
{
}
virtual void
- send(const Block& wire) DECL_OVERRIDE;
+ send(const Block& wire) override;
virtual void
- send(const Block& header, const Block& payload) DECL_OVERRIDE;
+ send(const Block& header, const Block& payload) override;
private:
NFD_LOG_INCLASS_DECLARE();
diff --git a/daemon/face/multicast-udp-transport.hpp b/daemon/face/multicast-udp-transport.hpp
index 7cd5dfe..b16ac6a 100644
--- a/daemon/face/multicast-udp-transport.hpp
+++ b/daemon/face/multicast-udp-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -42,7 +42,7 @@
/**
* \brief A Transport that communicates on a UDP multicast group
*/
-class MulticastUdpTransport DECL_CLASS_FINAL : public DatagramTransport<boost::asio::ip::udp, Multicast>
+class MulticastUdpTransport final : public DatagramTransport<boost::asio::ip::udp, Multicast>
{
public:
/**
@@ -59,14 +59,14 @@
protected:
virtual void
- beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) DECL_FINAL;
+ beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) final;
private:
virtual void
- doSend(Transport::Packet&& packet) DECL_FINAL;
+ doSend(Transport::Packet&& packet) final;
virtual void
- doClose() DECL_FINAL;
+ doClose() final;
private:
protocol::endpoint m_multicastGroup;
diff --git a/daemon/face/stream-transport.hpp b/daemon/face/stream-transport.hpp
index 1c9b720..e775fc0 100644
--- a/daemon/face/stream-transport.hpp
+++ b/daemon/face/stream-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -53,13 +53,13 @@
protected:
virtual void
- doClose() DECL_OVERRIDE;
+ doClose() override;
void
deferredClose();
virtual void
- doSend(Transport::Packet&& packet) DECL_OVERRIDE;
+ doSend(Transport::Packet&& packet) override;
void
sendFromQueue();
diff --git a/daemon/face/tcp-factory.hpp b/daemon/face/tcp-factory.hpp
index 5bf3694..126aef2 100644
--- a/daemon/face/tcp-factory.hpp
+++ b/daemon/face/tcp-factory.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -83,10 +83,10 @@
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
const FaceCreatedCallback& onCreated,
- const FaceCreationFailedCallback& onConnectFailed) DECL_OVERRIDE;
+ const FaceCreationFailedCallback& onConnectFailed) override;
virtual std::vector<shared_ptr<const Channel>>
- getChannels() const DECL_OVERRIDE;
+ getChannels() const override;
PUBLIC_WITH_TESTS_ELSE_PRIVATE:
void
diff --git a/daemon/face/tcp-transport.hpp b/daemon/face/tcp-transport.hpp
index 7ddd648..871d034 100644
--- a/daemon/face/tcp-transport.hpp
+++ b/daemon/face/tcp-transport.hpp
@@ -1,11 +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
+ * Copyright (c) 2014-2016, 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.
@@ -20,7 +21,7 @@
*
* You should have received a copy of the GNU General Public License along with
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
#ifndef NFD_DAEMON_FACE_TCP_TRANSPORT_HPP
#define NFD_DAEMON_FACE_TCP_TRANSPORT_HPP
@@ -33,7 +34,7 @@
/**
* \brief A Transport that communicates on a connected TCP socket
*/
-class TcpTransport DECL_CLASS_FINAL : public StreamTransport<boost::asio::ip::tcp>
+class TcpTransport final : public StreamTransport<boost::asio::ip::tcp>
{
public:
TcpTransport(protocol::socket&& socket,
@@ -41,7 +42,7 @@
protected:
virtual void
- beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) DECL_FINAL;
+ beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) final;
};
} // namespace face
diff --git a/daemon/face/udp-factory.hpp b/daemon/face/udp-factory.hpp
index 9c851bd..bda8ac5 100644
--- a/daemon/face/udp-factory.hpp
+++ b/daemon/face/udp-factory.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -150,10 +150,10 @@
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
const FaceCreatedCallback& onCreated,
- const FaceCreationFailedCallback& onConnectFailed) DECL_OVERRIDE;
+ const FaceCreationFailedCallback& onConnectFailed) override;
virtual std::vector<shared_ptr<const Channel>>
- getChannels() const DECL_OVERRIDE;
+ getChannels() const override;
PUBLIC_WITH_TESTS_ELSE_PRIVATE:
void
diff --git a/daemon/face/unicast-udp-transport.hpp b/daemon/face/unicast-udp-transport.hpp
index ab7adf2..80cd70b 100644
--- a/daemon/face/unicast-udp-transport.hpp
+++ b/daemon/face/unicast-udp-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -35,7 +35,7 @@
/**
* \brief A Transport that communicates on a unicast UDP socket
*/
-class UnicastUdpTransport DECL_CLASS_FINAL : public DatagramTransport<boost::asio::ip::udp, Unicast>
+class UnicastUdpTransport final : public DatagramTransport<boost::asio::ip::udp, Unicast>
{
public:
UnicastUdpTransport(protocol::socket&& socket,
@@ -44,7 +44,7 @@
protected:
virtual void
- beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) DECL_FINAL;
+ beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) final;
private:
void
diff --git a/daemon/face/unix-stream-channel.hpp b/daemon/face/unix-stream-channel.hpp
index fbddbe2..8bd87d8 100644
--- a/daemon/face/unix-stream-channel.hpp
+++ b/daemon/face/unix-stream-channel.hpp
@@ -1,11 +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
+ * Copyright (c) 2014-2016, 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.
@@ -20,7 +21,7 @@
*
* You should have received a copy of the GNU General Public License along with
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
#ifndef NFD_DAEMON_FACE_UNIX_STREAM_CHANNEL_HPP
#define NFD_DAEMON_FACE_UNIX_STREAM_CHANNEL_HPP
@@ -59,7 +60,7 @@
explicit
UnixStreamChannel(const unix_stream::Endpoint& endpoint);
- ~UnixStreamChannel() DECL_OVERRIDE;
+ ~UnixStreamChannel() override;
/**
* \brief Enable listening on the local endpoint, accept connections,
diff --git a/daemon/face/unix-stream-factory.hpp b/daemon/face/unix-stream-factory.hpp
index 43fe553..2f899b6 100644
--- a/daemon/face/unix-stream-factory.hpp
+++ b/daemon/face/unix-stream-factory.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -67,10 +67,10 @@
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
const FaceCreatedCallback& onCreated,
- const FaceCreationFailedCallback& onConnectFailed) DECL_OVERRIDE;
+ const FaceCreationFailedCallback& onConnectFailed) override;
virtual std::vector<shared_ptr<const Channel>>
- getChannels() const DECL_OVERRIDE;
+ getChannels() const override;
private:
/**
diff --git a/daemon/face/unix-stream-transport.hpp b/daemon/face/unix-stream-transport.hpp
index 30e8e98..e72c01f 100644
--- a/daemon/face/unix-stream-transport.hpp
+++ b/daemon/face/unix-stream-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -38,7 +38,7 @@
/**
* \brief A Transport that communicates on a stream-oriented Unix domain socket
*/
-class UnixStreamTransport DECL_CLASS_FINAL : public StreamTransport<boost::asio::local::stream_protocol>
+class UnixStreamTransport final : public StreamTransport<boost::asio::local::stream_protocol>
{
public:
explicit
@@ -46,7 +46,7 @@
protected:
virtual void
- beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) DECL_FINAL;
+ beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) final;
};
} // namespace face
diff --git a/daemon/face/websocket-factory.hpp b/daemon/face/websocket-factory.hpp
index 87947ba..110c026 100644
--- a/daemon/face/websocket-factory.hpp
+++ b/daemon/face/websocket-factory.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -80,10 +80,10 @@
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
const FaceCreatedCallback& onCreated,
- const FaceCreationFailedCallback& onConnectFailed) DECL_OVERRIDE;
+ const FaceCreationFailedCallback& onConnectFailed) override;
virtual std::vector<shared_ptr<const Channel>>
- getChannels() const DECL_OVERRIDE;
+ getChannels() const override;
private:
/**
diff --git a/daemon/face/websocket-transport.hpp b/daemon/face/websocket-transport.hpp
index 192c626..ea67ea2 100644
--- a/daemon/face/websocket-transport.hpp
+++ b/daemon/face/websocket-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -51,8 +51,8 @@
/** \brief A Transport that communicates on a WebSocket connection
*/
-class WebSocketTransport DECL_CLASS_FINAL : public Transport
- , protected virtual WebSocketTransportCounters
+class WebSocketTransport final : public Transport
+ , protected virtual WebSocketTransportCounters
{
public:
/** \brief counters provided by WebSocketTransport
@@ -64,7 +64,7 @@
time::milliseconds pingInterval);
virtual const Counters&
- getCounters() const DECL_OVERRIDE;
+ getCounters() const override;
/** \brief Translates a message into a Block
* and delivers it to the link service
@@ -80,14 +80,14 @@
protected:
virtual void
- beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) DECL_FINAL;
+ beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) final;
virtual void
- doClose() DECL_FINAL;
+ doClose() final;
private:
virtual void
- doSend(Transport::Packet&& packet) DECL_FINAL;
+ doSend(Transport::Packet&& packet) final;
void
schedulePing();
diff --git a/daemon/fw/access-strategy.hpp b/daemon/fw/access-strategy.hpp
index 5fadc85..2df13ad 100644
--- a/daemon/fw/access-strategy.hpp
+++ b/daemon/fw/access-strategy.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -59,11 +59,11 @@
afterReceiveInterest(const Face& inFace,
const Interest& interest,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+ shared_ptr<pit::Entry> pitEntry) override;
virtual void
beforeSatisfyInterest(shared_ptr<pit::Entry> pitEntry,
- const Face& inFace, const Data& data) DECL_OVERRIDE;
+ const Face& inFace, const Data& data) override;
private: // StrategyInfo
/** \brief StrategyInfo on PIT entry
diff --git a/daemon/fw/best-route-strategy.hpp b/daemon/fw/best-route-strategy.hpp
index 7ec64ff..6214f30 100644
--- a/daemon/fw/best-route-strategy.hpp
+++ b/daemon/fw/best-route-strategy.hpp
@@ -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-2016, 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.
@@ -54,7 +54,7 @@
afterReceiveInterest(const Face& inFace,
const Interest& interest,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+ shared_ptr<pit::Entry> pitEntry) override;
public:
static const Name STRATEGY_NAME;
diff --git a/daemon/fw/best-route-strategy2.hpp b/daemon/fw/best-route-strategy2.hpp
index 8985586..0be6490 100644
--- a/daemon/fw/best-route-strategy2.hpp
+++ b/daemon/fw/best-route-strategy2.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -57,12 +57,12 @@
virtual void
afterReceiveInterest(const Face& inFace, const Interest& interest,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+ shared_ptr<pit::Entry> pitEntry) override;
virtual void
afterReceiveNack(const Face& inFace, const lp::Nack& nack,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+ shared_ptr<pit::Entry> pitEntry) override;
public:
static const Name STRATEGY_NAME;
diff --git a/daemon/fw/broadcast-strategy.hpp b/daemon/fw/broadcast-strategy.hpp
index c923a04..bbfd0c6 100644
--- a/daemon/fw/broadcast-strategy.hpp
+++ b/daemon/fw/broadcast-strategy.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -43,7 +43,7 @@
afterReceiveInterest(const Face& inFace,
const Interest& interest,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+ shared_ptr<pit::Entry> pitEntry) override;
public:
static const Name STRATEGY_NAME;
diff --git a/daemon/fw/client-control-strategy.hpp b/daemon/fw/client-control-strategy.hpp
index 85a6e3b..402b54f 100644
--- a/daemon/fw/client-control-strategy.hpp
+++ b/daemon/fw/client-control-strategy.hpp
@@ -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-2016, 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.
@@ -49,7 +49,7 @@
afterReceiveInterest(const Face& inFace,
const Interest& interest,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+ shared_ptr<pit::Entry> pitEntry) override;
public:
static const Name STRATEGY_NAME;
diff --git a/daemon/fw/multicast-strategy.hpp b/daemon/fw/multicast-strategy.hpp
index 77075c3..ef3ba16 100644
--- a/daemon/fw/multicast-strategy.hpp
+++ b/daemon/fw/multicast-strategy.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -42,7 +42,7 @@
afterReceiveInterest(const Face& inFace,
const Interest& interest,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+ shared_ptr<pit::Entry> pitEntry) override;
public:
static const Name STRATEGY_NAME;
diff --git a/daemon/fw/ncc-strategy.hpp b/daemon/fw/ncc-strategy.hpp
index e9fb94e..9e58494 100644
--- a/daemon/fw/ncc-strategy.hpp
+++ b/daemon/fw/ncc-strategy.hpp
@@ -45,11 +45,11 @@
afterReceiveInterest(const Face& inFace,
const Interest& interest,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+ shared_ptr<pit::Entry> pitEntry) override;
virtual void
beforeSatisfyInterest(shared_ptr<pit::Entry> pitEntry,
- const Face& inFace, const Data& data) DECL_OVERRIDE;
+ const Face& inFace, const Data& data) override;
PUBLIC_WITH_TESTS_ELSE_PROTECTED:
/// StrategyInfo on measurements::Entry
diff --git a/daemon/fw/retx-suppression-exponential.hpp b/daemon/fw/retx-suppression-exponential.hpp
index 4909417..a2fbe7b 100644
--- a/daemon/fw/retx-suppression-exponential.hpp
+++ b/daemon/fw/retx-suppression-exponential.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -54,7 +54,7 @@
*/
virtual Result
decide(const Face& inFace, const Interest& interest,
- pit::Entry& pitEntry) const DECL_OVERRIDE;
+ pit::Entry& pitEntry) const override;
public:
/** \brief StrategyInfo on pit::Entry
diff --git a/daemon/fw/retx-suppression-fixed.hpp b/daemon/fw/retx-suppression-fixed.hpp
index 0f0ca19..95baae1 100644
--- a/daemon/fw/retx-suppression-fixed.hpp
+++ b/daemon/fw/retx-suppression-fixed.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -45,7 +45,7 @@
*/
virtual Result
decide(const Face& inFace, const Interest& interest,
- pit::Entry& pitEntry) const DECL_OVERRIDE;
+ pit::Entry& pitEntry) const override;
public:
static const time::milliseconds DEFAULT_MIN_RETX_INTERVAL;
diff --git a/daemon/mgmt/nfd-manager-base.hpp b/daemon/mgmt/nfd-manager-base.hpp
index 4104fbe..6273624 100644
--- a/daemon/mgmt/nfd-manager-base.hpp
+++ b/daemon/mgmt/nfd-manager-base.hpp
@@ -70,7 +70,7 @@
authorize(const Name& prefix, const Interest& interest,
const ndn::mgmt::ControlParameters* params,
ndn::mgmt::AcceptContinuation accept,
- ndn::mgmt::RejectContinuation reject) DECL_OVERRIDE;
+ ndn::mgmt::RejectContinuation reject) override;
private:
CommandValidator& m_validator;
diff --git a/daemon/table/cs-policy-lru.hpp b/daemon/table/cs-policy-lru.hpp
index bea845c..81f65bb 100644
--- a/daemon/table/cs-policy-lru.hpp
+++ b/daemon/table/cs-policy-lru.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -72,19 +72,19 @@
private:
virtual void
- doAfterInsert(iterator i) DECL_OVERRIDE;
+ doAfterInsert(iterator i) override;
virtual void
- doAfterRefresh(iterator i) DECL_OVERRIDE;
+ doAfterRefresh(iterator i) override;
virtual void
- doBeforeErase(iterator i) DECL_OVERRIDE;
+ doBeforeErase(iterator i) override;
virtual void
- doBeforeUse(iterator i) DECL_OVERRIDE;
+ doBeforeUse(iterator i) override;
virtual void
- evictEntries() DECL_OVERRIDE;
+ evictEntries() override;
private:
/** \brief moves an entry to the end of queue
diff --git a/daemon/table/cs-policy-priority-fifo.hpp b/daemon/table/cs-policy-priority-fifo.hpp
index 0078c71..c453990 100644
--- a/daemon/table/cs-policy-priority-fifo.hpp
+++ b/daemon/table/cs-policy-priority-fifo.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -83,19 +83,19 @@
private:
virtual void
- doAfterInsert(iterator i) DECL_OVERRIDE;
+ doAfterInsert(iterator i) override;
virtual void
- doAfterRefresh(iterator i) DECL_OVERRIDE;
+ doAfterRefresh(iterator i) override;
virtual void
- doBeforeErase(iterator i) DECL_OVERRIDE;
+ doBeforeErase(iterator i) override;
virtual void
- doBeforeUse(iterator i) DECL_OVERRIDE;
+ doBeforeUse(iterator i) override;
virtual void
- evictEntries() DECL_OVERRIDE;
+ evictEntries() override;
private:
/** \brief evicts one entry
@@ -126,11 +126,11 @@
EntryInfoMapFifo m_entryInfoMap;
};
-} // namespace priorityfifo
+} // namespace priority_fifo
using priority_fifo::PriorityFifoPolicy;
} // namespace cs
} // namespace nfd
-#endif // NFD_DAEMON_TABLE_CS_POLICY_FIFO_HPP
\ No newline at end of file
+#endif // NFD_DAEMON_TABLE_CS_POLICY_FIFO_HPP
diff --git a/docs/doxygen.conf.in b/docs/doxygen.conf.in
index 7b9fa67..1406605 100644
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -1924,13 +1924,10 @@
BOOST_STATIC_ASSERT(x)= \
BOOST_CONCEPT_ASSERT(x)= \
BOOST_CONCEPT_REQUIRES(x)= \
- DECL_OVERRIDE=override \
PUBLIC_WITH_TESTS_ELSE_PRIVATE=private \
PUBLIC_WITH_TESTS_ELSE_PROTECTED=protected \
PROTECTED_WITH_TESTS_ELSE_PRIVATE=private \
- VIRTUAL_WITH_TESTS \
- DECL_CLASS_FINAL=final \
- DECL_FINAL=final
+ VIRTUAL_WITH_TESTS
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The
diff --git a/tests/daemon/face/dummy-face.cpp b/tests/daemon/face/dummy-face.cpp
index c4f6154..5c9895b 100644
--- a/tests/daemon/face/dummy-face.cpp
+++ b/tests/daemon/face/dummy-face.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -55,28 +55,28 @@
private:
virtual void
- doSendInterest(const Interest& interest) DECL_OVERRIDE
+ doSendInterest(const Interest& interest) override
{
this->sentInterests.push_back(interest);
this->afterSend(tlv::Interest);
}
virtual void
- doSendData(const Data& data) DECL_OVERRIDE
+ doSendData(const Data& data) override
{
this->sentData.push_back(data);
this->afterSend(tlv::Data);
}
virtual void
- doSendNack(const lp::Nack& nack) DECL_OVERRIDE
+ doSendNack(const lp::Nack& nack) override
{
this->sentNacks.push_back(nack);
this->afterSend(lp::tlv::Nack);
}
virtual void
- doReceivePacket(Transport::Packet&& packet) DECL_OVERRIDE
+ doReceivePacket(Transport::Packet&& packet) override
{
BOOST_ASSERT(false);
}
diff --git a/tests/daemon/face/dummy-receive-link-service.hpp b/tests/daemon/face/dummy-receive-link-service.hpp
index 91dabd2..1d40653 100644
--- a/tests/daemon/face/dummy-receive-link-service.hpp
+++ b/tests/daemon/face/dummy-receive-link-service.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -41,25 +41,25 @@
{
private:
virtual void
- doSendInterest(const Interest& interest) DECL_OVERRIDE
+ doSendInterest(const Interest& interest) override
{
BOOST_ASSERT(false);
}
virtual void
- doSendData(const Data& data) DECL_OVERRIDE
+ doSendData(const Data& data) override
{
BOOST_ASSERT(false);
}
virtual void
- doSendNack(const lp::Nack& nack) DECL_OVERRIDE
+ doSendNack(const lp::Nack& nack) override
{
BOOST_ASSERT(false);
}
virtual void
- doReceivePacket(Transport::Packet&& packet) DECL_OVERRIDE
+ doReceivePacket(Transport::Packet&& packet) override
{
receivedPackets.push_back(packet);
}
diff --git a/tests/daemon/face/dummy-transport.hpp b/tests/daemon/face/dummy-transport.hpp
index f957e1e..4dfda76 100644
--- a/tests/daemon/face/dummy-transport.hpp
+++ b/tests/daemon/face/dummy-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -81,21 +81,21 @@
protected:
virtual void
- beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) DECL_OVERRIDE
+ beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) override
{
// accept everything
}
private:
virtual void
- doClose() DECL_OVERRIDE
+ doClose() override
{
isClosed = true;
this->setState(TransportState::CLOSED);
}
virtual void
- doSend(Packet&& packet) DECL_OVERRIDE
+ doSend(Packet&& packet) override
{
sentPackets.push_back(std::move(packet));
}
diff --git a/tests/daemon/fw/dummy-strategy.hpp b/tests/daemon/fw/dummy-strategy.hpp
index 33d2656..25623cb 100644
--- a/tests/daemon/fw/dummy-strategy.hpp
+++ b/tests/daemon/fw/dummy-strategy.hpp
@@ -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-2016, 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.
@@ -53,14 +53,15 @@
* otherwise, reject pending Interest action is invoked.
*/
virtual void
- afterReceiveInterest(const Face& inFace, const Interest& interest,
+ afterReceiveInterest(const Face& inFace,
+ const Interest& interest,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
+ shared_ptr<pit::Entry> pitEntry) override
{
++afterReceiveInterest_count;
if (wantAfterReceiveInterestCalls) {
- afterReceiveInterestCalls.push_back(std::make_tuple(inFace.getId(),
- interest, fibEntry, pitEntry));
+ afterReceiveInterestCalls.push_back(std::make_tuple(inFace.getId(), interest,
+ fibEntry, pitEntry));
}
if (interestOutFace) {
@@ -73,21 +74,23 @@
virtual void
beforeSatisfyInterest(shared_ptr<pit::Entry> pitEntry,
- const Face& inFace, const Data& data) DECL_OVERRIDE
+ const Face& inFace,
+ const Data& data) override
{
++beforeSatisfyInterest_count;
}
virtual void
- beforeExpirePendingInterest(shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
+ beforeExpirePendingInterest(shared_ptr<pit::Entry> pitEntry) override
{
++beforeExpirePendingInterest_count;
}
virtual void
- afterReceiveNack(const Face& inFace, const lp::Nack& nack,
+ afterReceiveNack(const Face& inFace,
+ const lp::Nack& nack,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
+ shared_ptr<pit::Entry> pitEntry) override
{
++afterReceiveNack_count;
}
@@ -102,7 +105,6 @@
int beforeSatisfyInterest_count;
int beforeExpirePendingInterest_count;
int afterReceiveNack_count;
-
};
} // namespace tests
diff --git a/tests/daemon/fw/forwarder.t.cpp b/tests/daemon/fw/forwarder.t.cpp
index 45014ff..310139f 100644
--- a/tests/daemon/fw/forwarder.t.cpp
+++ b/tests/daemon/fw/forwarder.t.cpp
@@ -133,14 +133,14 @@
}
virtual void
- onDataUnsolicited(Face& inFace, const Data& data) DECL_OVERRIDE
+ onDataUnsolicited(Face& inFace, const Data& data) override
{
++onDataUnsolicited_count;
}
protected:
virtual void
- dispatchToStrategy(shared_ptr<pit::Entry> pitEntry, function<void(fw::Strategy*)> f) DECL_OVERRIDE
+ dispatchToStrategy(shared_ptr<pit::Entry> pitEntry, function<void(fw::Strategy*)> f) override
{
++dispatchToStrategy_count;
}
diff --git a/tests/daemon/fw/strategy-tester.hpp b/tests/daemon/fw/strategy-tester.hpp
index 75c5a67..ed831ff 100644
--- a/tests/daemon/fw/strategy-tester.hpp
+++ b/tests/daemon/fw/strategy-tester.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -54,14 +54,14 @@
virtual void
sendInterest(shared_ptr<pit::Entry> pitEntry,
shared_ptr<Face> outFace,
- bool wantNewNonce = false) DECL_OVERRIDE;
+ bool wantNewNonce = false) override;
virtual void
- rejectPendingInterest(shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+ rejectPendingInterest(shared_ptr<pit::Entry> pitEntry) override;
virtual void
sendNack(shared_ptr<pit::Entry> pitEntry, const Face& outFace,
- const lp::NackHeader& header) DECL_OVERRIDE;
+ const lp::NackHeader& header) override;
public:
struct SendInterestArgs
diff --git a/tests/daemon/mgmt/face-manager.t.cpp b/tests/daemon/mgmt/face-manager.t.cpp
index d3e0b34..851a785 100644
--- a/tests/daemon/mgmt/face-manager.t.cpp
+++ b/tests/daemon/mgmt/face-manager.t.cpp
@@ -335,12 +335,12 @@
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
const FaceCreatedCallback& onCreated,
- const FaceCreationFailedCallback& onConnectFailed) DECL_OVERRIDE
+ const FaceCreationFailedCallback& onConnectFailed) override
{
}
virtual std::vector<shared_ptr<const Channel>>
- getChannels() const DECL_OVERRIDE
+ getChannels() const override
{
return m_channels;
}
diff --git a/tools/ndn-autoconfig/guess-from-identity-name.hpp b/tools/ndn-autoconfig/guess-from-identity-name.hpp
index 3e0008f..e2a0bf0 100644
--- a/tools/ndn-autoconfig/guess-from-identity-name.hpp
+++ b/tools/ndn-autoconfig/guess-from-identity-name.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -64,7 +64,7 @@
const NextStageCallback& nextStageOnFailure);
virtual void
- start() DECL_OVERRIDE;
+ start() override;
};
} // namespace autoconfig
diff --git a/tools/ndn-autoconfig/guess-from-search-domains.hpp b/tools/ndn-autoconfig/guess-from-search-domains.hpp
index e2eaa5a..bcfd4c8 100644
--- a/tools/ndn-autoconfig/guess-from-search-domains.hpp
+++ b/tools/ndn-autoconfig/guess-from-search-domains.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -57,7 +57,7 @@
const NextStageCallback& nextStageOnFailure);
virtual void
- start() DECL_OVERRIDE;
+ start() override;
};
} // namespace autoconfig
diff --git a/tools/ndn-autoconfig/multicast-discovery.hpp b/tools/ndn-autoconfig/multicast-discovery.hpp
index 893d233..8047926 100644
--- a/tools/ndn-autoconfig/multicast-discovery.hpp
+++ b/tools/ndn-autoconfig/multicast-discovery.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -59,7 +59,7 @@
MulticastDiscovery(Face& face, KeyChain& keyChain, const NextStageCallback& nextStageOnFailure);
virtual void
- start() DECL_OVERRIDE;
+ start() override;
private:
void
diff --git a/tools/nfd-status.cpp b/tools/nfd-status.cpp
index 9948391..a904827 100644
--- a/tools/nfd-status.cpp
+++ b/tools/nfd-status.cpp
@@ -59,7 +59,7 @@
int nSteps,
const OnDataValidated& onValidated,
const OnDataValidationFailed& onValidationFailed,
- std::vector<shared_ptr<ValidationRequest>>& nextSteps) DECL_OVERRIDE
+ std::vector<shared_ptr<ValidationRequest>>& nextSteps) override
{
const ndn::KeyLocator& locator = data.getSignature().getKeyLocator();
if (nfdId.empty() && locator.getType() == KeyLocator::KeyLocator_Name)
@@ -72,7 +72,7 @@
int nSteps,
const OnInterestValidated& onValidated,
const OnInterestValidationFailed& onValidationFailed,
- std::vector<shared_ptr<ValidationRequest>>& nextSteps) DECL_OVERRIDE
+ std::vector<shared_ptr<ValidationRequest>>& nextSteps) override
{
BOOST_ASSERT(false);
}