commit b525c1b23ab60456c5f30274cbaa572fccc5c657
author Chengyu Fan <chengy.fan@gmail.com> Mon Oct 13 14:35:29 2014 -0600
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Tue Oct 14 17:50:22 2014 -0700
tree 0c61e1cd37f2b9a060117573a583458cdbd27d3f
parent 3ccc6f79a30687172ca6b24a98a45f22a06a8fb5

management: remove deprecated FaceFlags APIs

refs #1992

Change-Id: I1553c64a09ffab323c0ff13890b31d6230024a3d

src/management/nfd-face-flags.hpp

diff --git a/src/management/nfd-face-flags.hpp b/src/management/nfd-face-flags.hpp
deleted file mode 120000
index 24090c2..0000000
--- a/src/management/nfd-face-flags.hpp
+++ /dev/null
@@ -1 +0,0 @@
-nfd-face-traits.hpp
\ No newline at end of file

src/management/nfd-face-traits.hpp

diff --git a/src/management/nfd-face-traits.hpp b/src/management/nfd-face-traits.hpp
index db4aef4..0160af1 100644
--- a/src/management/nfd-face-traits.hpp
+++ b/src/management/nfd-face-traits.hpp
@@ -31,20 +31,6 @@
 
 /**
  * \ingroup management
- * \deprecated provides additional information about a face
- */
-enum FaceFlags {
-  /** \deprecated face is local (for scope control purpose)
-   */
-  FACE_IS_LOCAL = 1,
-  /** \deprecated face is created on demand (accepted incoming connection,
-   *              not initiated outgoing connection)
-   */
-  FACE_IS_ON_DEMAND = 2
-};
-
-/**
- * \ingroup management
  * \brief provides additional information about a faceScope
  */
 enum FaceScope {
@@ -205,56 +191,6 @@
     return static_cast<C&>(*this);
   }
 
-  /**
-   * \deprecated Use getFaceScope instead
-   */
-  bool
-  isLocal() const
-  {
-    return getFlags() & FACE_IS_LOCAL;
-  }
-
-  /**
-   * \deprecated Use getFacePersistency instead
-   */
-  bool
-  isOnDemand() const
-  {
-    return getFlags() & FACE_IS_ON_DEMAND;
-  }
-
-  /**
-   * \deprecated Use getFaceScope, and getFacePersistency instead
-   */
-  uint64_t
-  getFlags() const
-  {
-    uint64_t flags = 0;
-    if (m_faceScope == FACE_SCOPE_LOCAL)
-      flags |= FACE_IS_LOCAL;
-    if (m_facePersistency == FACE_PERSISTENCY_ON_DEMAND)
-      flags |= FACE_IS_ON_DEMAND;
-    return flags;
-  }
-
-  /**
-   * \deprecated Use setFaceScope, and setFacePersistency instead
-   */
-  C&
-  setFlags(uint64_t flags)
-  {
-    wireReset();
-    if ((flags & FACE_IS_LOCAL) != 0)
-      m_faceScope = FACE_SCOPE_LOCAL;
-    else
-      m_faceScope = FACE_SCOPE_NON_LOCAL;
-    if ((flags & FACE_IS_ON_DEMAND) != 0)
-      m_facePersistency = FACE_PERSISTENCY_ON_DEMAND;
-    else
-      m_facePersistency = FACE_PERSISTENCY_PERSISTENT;
-    return static_cast<C&>(*this);
-  }
-
 protected:
   virtual void
   wireReset() const = 0;