commit 17032f8fa6aebc6d5f399e171ed77f2b4e01b001
author Yingdi Yu <yuyingdi@gmail.com> Tue Mar 25 15:48:23 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 15:16:11 2014 -0700
tree ce64143958c400f393114a05985d06b8456da534
parent a7876727b0b405fec8dcbe82443c233c7493fa08

namespace: try to resolve ndn and std conflicts

Change-Id: I141ead4b8f30ce75bae73974e47e6e5acd75a296

src/validator-panel.cpp

diff --git a/src/validator-panel.cpp b/src/validator-panel.cpp
index 8de4bb6..2197d66 100644
--- a/src/validator-panel.cpp
+++ b/src/validator-panel.cpp
@@ -14,12 +14,13 @@
 
 using namespace std;
 using namespace ndn;
-using namespace ndn::ptr_lib;
 
 INIT_LOGGER("ValidatorPanel");
 
 namespace chronos{
 
+using ndn::shared_ptr;
+
 const shared_ptr<CertificateCache> ValidatorPanel::DEFAULT_CERT_CACHE = shared_ptr<CertificateCache>();
 
 ValidatorPanel::ValidatorPanel(int stepLimit /* = 10 */,
@@ -39,7 +40,7 @@
                              int stepCount, 
                              const OnDataValidated& onValidated, 
                              const OnDataValidationFailed& onValidationFailed,
-                             vector<shared_ptr<ValidationRequest> >& nextSteps)
+                             std::vector<shared_ptr<ValidationRequest> >& nextSteps)
 {
   if(m_stepLimit == stepCount)
     {