commit bb778e7419a03e86506fe4fce99d73ee8d956b52
author philo <philoliang2011@gmail.com> Tue Aug 25 14:49:19 2015 -0700
committer philo <philoliang2011@gmail.com> Tue Sep 01 14:07:30 2015 -0700
tree fd7803d651193ebab97b7e7408cae45a6ae14814
parent 6fa52970f35a58df85dae9c1cca7be6c58ab7d0a

face: add DEPRECATED macro on registerPrefix and setInterestFilter overloads

Change-Id: Ib6c2efc286c51f2ac127a5f75901fb20b44b013c
Refs: #2967

src/face.hpp

diff --git a/src/face.hpp b/src/face.hpp
index ab526c3..f002e04 100644
--- a/src/face.hpp
+++ b/src/face.hpp
@@ -337,13 +337,14 @@
    * @return Opaque registered prefix ID which can be used with unsetInterestFilter or
    *         removeRegisteredPrefix
    */
+  DEPRECATED(
   const RegisteredPrefixId*
   setInterestFilter(const InterestFilter& interestFilter,
                     const OnInterest& onInterest,
                     const RegisterPrefixSuccessCallback& onSuccess,
                     const RegisterPrefixFailureCallback& onFailure,
                     const IdentityCertificate& certificate,
-                    uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT);
+                    uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT));
 
   /**
    * @deprecated Use override with SigningInfo instead of this function
@@ -367,12 +368,13 @@
    * @return Opaque registered prefix ID which can be used with unsetInterestFilter or
    *         removeRegisteredPrefix
    */
+  DEPRECATED(
   const RegisteredPrefixId*
   setInterestFilter(const InterestFilter& interestFilter,
                     const OnInterest& onInterest,
                     const RegisterPrefixFailureCallback& onFailure,
                     const IdentityCertificate& certificate,
-                    uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT);
+                    uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT));
 
   /**
    * @deprecated Use override with SigningInfo instead of this function
@@ -395,13 +397,14 @@
    *
    * @return Opaque registered prefix ID which can be used with removeRegisteredPrefix
    */
+  DEPRECATED(
   const RegisteredPrefixId*
   setInterestFilter(const InterestFilter& interestFilter,
                     const OnInterest& onInterest,
                     const RegisterPrefixSuccessCallback& onSuccess,
                     const RegisterPrefixFailureCallback& onFailure,
                     const Name& identity,
-                    uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT);
+                    uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT));
 
   /**
    * @deprecated Use override with SigningInfo instead of this function
@@ -423,12 +426,13 @@
    *
    * @return Opaque registered prefix ID which can be used with removeRegisteredPrefix
    */
+  DEPRECATED(
   const RegisteredPrefixId*
   setInterestFilter(const InterestFilter& interestFilter,
                     const OnInterest& onInterest,
                     const RegisterPrefixFailureCallback& onFailure,
                     const Name& identity,
-                    uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT);
+                    uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT));
 #endif // NDN_FACE_KEEP_DEPRECATED_REGISTRATION_SIGNING
 
   /**
@@ -472,12 +476,13 @@
    *
    * @return The registered prefix ID which can be used with unregisterPrefix
    */
+  DEPRECATED(
   const RegisteredPrefixId*
   registerPrefix(const Name& prefix,
                  const RegisterPrefixSuccessCallback& onSuccess,
                  const RegisterPrefixFailureCallback& onFailure,
                  const IdentityCertificate& certificate,
-                 uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT);
+                 uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT));
 
   /**
    * @deprecated Use override with SigningInfo instead of this function
@@ -497,12 +502,13 @@
    *
    * @return The registered prefix ID which can be used with unregisterPrefix
    */
+  DEPRECATED(
   const RegisteredPrefixId*
   registerPrefix(const Name& prefix,
                  const RegisterPrefixSuccessCallback& onSuccess,
                  const RegisterPrefixFailureCallback& onFailure,
                  const Name& identity,
-                 uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT);
+                 uint64_t flags = nfd::ROUTE_FLAG_CHILD_INHERIT));
 #endif // NDN_FACE_KEEP_DEPRECATED_REGISTRATION_SIGNING
 
   /**