util: FaceUri: modernize and simplify code with C++11 features
Change-Id: Ie6a59567a635b6c69b970e9e1e50eafff14ea7fa
diff --git a/src/util/face-uri.hpp b/src/util/face-uri.hpp
index b222323..f726388 100644
--- a/src/util/face-uri.hpp
+++ b/src/util/face-uri.hpp
@@ -1,12 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * 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
+ * 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 ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -29,15 +29,19 @@
#define NDN_UTIL_FACE_URI_HPP
#include "../common.hpp"
-#include <boost/asio/ip/udp.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/local/stream_protocol.hpp>
-#include "ethernet.hpp"
#include "time.hpp"
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ip/udp.hpp>
+#include <boost/asio/local/stream_protocol.hpp>
+
namespace ndn {
namespace util {
+namespace ethernet {
+class Address;
+} // namespace ethernet
+
/** \brief represents the underlying protocol and address used by a Face
* \sa http://redmine.named-data.net/projects/nfd/wiki/FaceMgmt#FaceUri
*/
@@ -82,7 +86,7 @@
explicit
FaceUri(const boost::asio::ip::tcp::endpoint& endpoint);
- /// construct tcp canonical FaceUri with customized scheme
+ /// construct tcp canonical FaceUri with custom scheme
FaceUri(const boost::asio::ip::tcp::endpoint& endpoint, const std::string& scheme);
#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
@@ -176,15 +180,16 @@
void
canonize(const CanonizeSuccessCallback& onSuccess,
const CanonizeFailureCallback& onFailure,
- boost::asio::io_service& io, const time::nanoseconds& timeout) const;
+ boost::asio::io_service& io,
+ const time::nanoseconds& timeout) const;
private:
std::string m_scheme;
std::string m_host;
- /// whether to add [] around host when writing string
- bool m_isV6;
std::string m_port;
std::string m_path;
+ /// whether to add [] around host when writing string
+ bool m_isV6;
friend std::ostream& operator<<(std::ostream& os, const FaceUri& uri);
};