commit df5927eeaa9d8965b8df63c6a7e578aa10124ba7
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Mon Feb 23 15:43:03 2015 -0800
committer Spyridon Mastorakis <spiros.mastorakis@gmail.com> Mon Feb 23 18:33:27 2015 -0800
tree af22f53660d182ec8e5d39a272c5cf6cd25e5f7a
parent 00fade2bc494e7e5458f18e36b856aae7bcc61e1

encoding/meta-info: Delete deprecated MetaInfo::TYPE_*

Change-Id: I38c3ba68b701709a3a1b41cce327e030a391ba19
Refs: #2170

src/encoding/tlv.hpp

diff --git a/src/encoding/tlv.hpp b/src/encoding/tlv.hpp
index 6a7589e..01a8679 100644
--- a/src/encoding/tlv.hpp
+++ b/src/encoding/tlv.hpp
@@ -116,11 +116,6 @@
   ContentType_Nack = 3
 };
 
-/** @deprecated use ContentType_Blob
- */
-static const uint32_t DEPRECATED(ContentType_Default) = ContentType_Blob;
-
-
 /**
  * @brief Read VAR-NUMBER in NDN-TLV encoding
  *

src/meta-info.hpp

diff --git a/src/meta-info.hpp b/src/meta-info.hpp
index 5ba4729..e88c870 100644
--- a/src/meta-info.hpp
+++ b/src/meta-info.hpp
@@ -184,27 +184,6 @@
   bool
   operator!=(const MetaInfo& other) const;
 
-public: // deprecated
-  /** @deprecated use tlv::ContentType_Blob
-   */
-  static const uint32_t DEPRECATED(TYPE_BLOB) = tlv::ContentType_Blob;
-
-  /** @deprecated use tlv::ContentType_Link
-   */
-  static const uint32_t DEPRECATED(TYPE_LINK) = tlv::ContentType_Link;
-
-  /** @deprecated use tlv::ContentType_Key
-   */
-  static const uint32_t DEPRECATED(TYPE_KEY) = tlv::ContentType_Key;
-
-  /** @deprecated use tlv::ContentType_Nack
-   */
-  static const uint32_t DEPRECATED(TYPE_NACK) = tlv::ContentType_Nack;
-
-  /** @deprecated use tlv::ContentType_Default
-   */
-  static const uint32_t DEPRECATED(TYPE_DEFAULT) = tlv::ContentType_Blob;
-
 private:
   uint32_t m_type;
   time::milliseconds m_freshnessPeriod;