commit 67f11acf5c2e2ff8bc81f5f6b86076bcae0593dd
author Junxiao Shi <git@mail1.yoursunny.com> Sun Oct 19 09:29:13 2014 -0700
committer Junxiao Shi <sunnylandh@gmail.com> Mon Oct 20 06:52:36 2014 -0700
tree 1198dd4689f1210d96c0baf3b252c650f3253519
parent a110f268c7ced8eddffe437abd5ac9cf923a905f

all: avoid usage of deprecated namespace ndn::Tlv

refs #2079

Change-Id: I3d8748929706726b55fe1a9a0f6ae00857ea3547

tests/daemon/mgmt/channel-status-publisher.cpp

diff --git a/tests/daemon/mgmt/channel-status-publisher.cpp b/tests/daemon/mgmt/channel-status-publisher.cpp
index 6d33f4d..370efe1 100644
--- a/tests/daemon/mgmt/channel-status-publisher.cpp
+++ b/tests/daemon/mgmt/channel-status-publisher.cpp
@@ -73,7 +73,7 @@
 
     // wrap the Channel Status entries in a single Content TLV for easy parsing
     m_buffer.prependVarNumber(m_buffer.size());
-    m_buffer.prependVarNumber(ndn::Tlv::Content);
+    m_buffer.prependVarNumber(tlv::Content);
 
     ndn::Block parser(m_buffer.buf(), m_buffer.size());
     parser.parse();

tests/daemon/mgmt/face-status-publisher-common.hpp

diff --git a/tests/daemon/mgmt/face-status-publisher-common.hpp b/tests/daemon/mgmt/face-status-publisher-common.hpp
index e2f19f1..11f4913 100644
--- a/tests/daemon/mgmt/face-status-publisher-common.hpp
+++ b/tests/daemon/mgmt/face-status-publisher-common.hpp
@@ -82,7 +82,7 @@
     }
   std::stringstream error;
   error << "expected type " << type << " got " << block.type();
-  throw ndn::Tlv::Error(error.str());
+  throw tlv::Error(error.str());
 }
 
 static inline uint64_t
@@ -96,7 +96,7 @@
       ++i;
       return readNonNegativeIntegerType(block, type);
     }
-  throw ndn::Tlv::Error("Unexpected end of FaceStatus");
+  throw tlv::Error("Unexpected end of FaceStatus");
 }
 
 class FaceStatusPublisherFixture : public BaseFixture
@@ -179,7 +179,7 @@
 
     // wrap the Face Statuses in a single Content TLV for easy parsing
     m_buffer.prependVarNumber(m_buffer.size());
-    m_buffer.prependVarNumber(ndn::Tlv::Content);
+    m_buffer.prependVarNumber(tlv::Content);
 
     ndn::Block parser(m_buffer.buf(), m_buffer.size());
     parser.parse();

tests/daemon/mgmt/fib-enumeration-publisher-common.hpp

diff --git a/tests/daemon/mgmt/fib-enumeration-publisher-common.hpp b/tests/daemon/mgmt/fib-enumeration-publisher-common.hpp
index bfb19d9..cbb7280 100644
--- a/tests/daemon/mgmt/fib-enumeration-publisher-common.hpp
+++ b/tests/daemon/mgmt/fib-enumeration-publisher-common.hpp
@@ -51,7 +51,7 @@
     }
   std::stringstream error;
   error << "Expected type " << type << " got " << block.type();
-  throw ndn::Tlv::Error(error.str());
+  throw tlv::Error(error.str());
 }
 
 static inline uint64_t
@@ -68,7 +68,7 @@
   std::stringstream error;
   error << "Unexpected end of Block while attempting to read type #"
         << type;
-  throw ndn::Tlv::Error(error.str());
+  throw tlv::Error(error.str());
 }
 
 class FibEnumerationPublisherFixture : public BaseFixture
@@ -120,7 +120,7 @@
     BOOST_REQUIRE(i != entry.elements_end());
 
 
-    BOOST_REQUIRE(i->type() == ndn::Tlv::Name);
+    BOOST_REQUIRE(i->type() == tlv::Name);
     Name prefix(*i);
     ++i;
 
@@ -181,7 +181,7 @@
 
     // wrap the FIB Entry blocks in a single Content TLV for easy parsing
     m_buffer.prependVarNumber(m_buffer.size());
-    m_buffer.prependVarNumber(ndn::Tlv::Content);
+    m_buffer.prependVarNumber(tlv::Content);
 
     ndn::Block parser(m_buffer.buf(), m_buffer.size());
     parser.parse();

tests/daemon/mgmt/strategy-choice-publisher.cpp

diff --git a/tests/daemon/mgmt/strategy-choice-publisher.cpp b/tests/daemon/mgmt/strategy-choice-publisher.cpp
index fda3e1e..e85bc4a 100644
--- a/tests/daemon/mgmt/strategy-choice-publisher.cpp
+++ b/tests/daemon/mgmt/strategy-choice-publisher.cpp
@@ -79,7 +79,7 @@
 
     // wrap the Strategy Choice entries in a single Content TLV for easy parsing
     m_buffer.prependVarNumber(m_buffer.size());
-    m_buffer.prependVarNumber(ndn::Tlv::Content);
+    m_buffer.prependVarNumber(tlv::Content);
 
     ndn::Block parser(m_buffer.buf(), m_buffer.size());
     parser.parse();