commit d1a415c840b4bf04d544745fca1391e51e0ccec3
author Davide Pesavento <davide.pesavento@lip6.fr> Mon Feb 20 00:41:42 2017 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Tue Feb 21 20:59:55 2017 -0500
tree 84253345cdec35f466bcfcf1615a4a5985a8d73b
parent 484bbe544891351f53fdf40c8a5991504ecd2c7c

mgmt: rename RibFlagsTraits to RouteFlagsTraits

Change-Id: Ide90020347d8eb5fec7d8cd4fb53b89e36d58e89

src/management/nfd-rib-flags.hpp

diff --git a/src/management/nfd-rib-flags.hpp b/src/management/nfd-rib-flags.hpp
deleted file mode 100644
index 8a15a34..0000000
--- a/src/management/nfd-rib-flags.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
- *
- * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
- *
- * ndn-cxx library is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * ndn-cxx library 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 Lesser General Public License for more details.
- *
- * You should have received copies of the GNU General Public License and GNU Lesser
- * General Public License along with ndn-cxx, e.g., in COPYING.md file.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
- */
-
-/** \file
- *  \deprecated Use mgmt/nfd/rib-flags.hpp
- */
-#include "../mgmt/nfd/rib-flags.hpp"

src/mgmt/nfd/rib-entry.hpp

diff --git a/src/mgmt/nfd/rib-entry.hpp b/src/mgmt/nfd/rib-entry.hpp
index 0c2071d..8b82238 100644
--- a/src/mgmt/nfd/rib-entry.hpp
+++ b/src/mgmt/nfd/rib-entry.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_MGMT_NFD_RIB_ENTRY_HPP
 #define NDN_MGMT_NFD_RIB_ENTRY_HPP
 
-#include "rib-flags.hpp"
+#include "route-flags-traits.hpp"
 #include "../../encoding/block.hpp"
 #include "../../name.hpp"
 #include "../../util/time.hpp"
@@ -39,7 +39,7 @@
  *
  * \sa https://redmine.named-data.net/projects/nfd/wiki/RibMgmt#Route
  */
-class Route : public RibFlagsTraits<Route>
+class Route : public RouteFlagsTraits<Route>
 {
 public:
   class Error : public tlv::Error

src/mgmt/nfd/route-flags-traits.hpp

diff --git a/src/mgmt/nfd/rib-flags.hpp b/src/mgmt/nfd/route-flags-traits.hpp
similarity index 96%
rename from src/mgmt/nfd/rib-flags.hpp
rename to src/mgmt/nfd/route-flags-traits.hpp
index ebc2b9e..08bf86a 100644
--- a/src/mgmt/nfd/rib-flags.hpp
+++ b/src/mgmt/nfd/route-flags-traits.hpp
@@ -35,7 +35,7 @@
  *           a `RouteFlags getFlags() const` member function
  */
 template<typename T>
-class RibFlagsTraits
+class RouteFlagsTraits
 {
 public:
   bool
@@ -51,7 +51,7 @@
   }
 
 protected:
-  RibFlagsTraits() = default;
+  RouteFlagsTraits() = default;
 };
 
 } // namespace nfd