commit b1d67469cb5fa452bd986633402a7c795c0f43cc
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Nov 18 20:25:00 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Nov 18 23:35:54 2013 -0800
tree e3477fb4a507cd6f3f56db1392c45ebcc878adff
parent 219fcb5a9a5fbc47b5b15ba145096da3adf61036

Fixing usages of ptr_lib::shared_ptr

In certain cases, importing both std:: and ndn::ptr_lib namespaces
causes ambiguity for shared_ptr type.

Change-Id: Iddc02353e1615b2387277c56185a1dd873d54459

src/security/identity/basic-identity-storage.cpp

diff --git a/src/security/identity/basic-identity-storage.cpp b/src/security/identity/basic-identity-storage.cpp
index 67a68f0..38cd55b 100644
--- a/src/security/identity/basic-identity-storage.cpp
+++ b/src/security/identity/basic-identity-storage.cpp
@@ -26,7 +26,6 @@
 INIT_LOGGER("BasicIdentityStorage");
 
 using namespace std;
-using namespace ndn::ptr_lib;
 
 namespace ndn
 {
@@ -444,7 +443,7 @@
   sqlite3_finalize(statement);
 }
 
-shared_ptr<Data> 
+ptr_lib::shared_ptr<Data> 
 BasicIdentityStorage::getCertificate(const Name &certificateName, bool allowAny)
 {
   if (doesCertificateExist(certificateName)) {
@@ -468,7 +467,7 @@
       
     int res = sqlite3_step(statement);
       
-    shared_ptr<Data> data(new Data());
+    ptr_lib::shared_ptr<Data> data(new Data());
 
     if (res == SQLITE_ROW)
       data->wireDecode((const uint8_t*)sqlite3_column_blob(statement, 0), sqlite3_column_bytes(statement, 0));            
@@ -478,7 +477,7 @@
   }
   else {
     _LOG_DEBUG("Certificate does not exist!");
-    return shared_ptr<Data>();
+    return ptr_lib::shared_ptr<Data>();
   }
 }