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
diff --git a/src/security/certificate/public-key.cpp b/src/security/certificate/public-key.cpp
index 1d5deb8..5c20b67 100644
--- a/src/security/certificate/public-key.cpp
+++ b/src/security/certificate/public-key.cpp
@@ -9,17 +9,16 @@
// We can use ndnboost::iostreams because this is internal and will not conflict with the application if it uses boost::iostreams.
#include <ndnboost/iostreams/stream.hpp>
#include <ndnboost/iostreams/device/array.hpp>
-#include <ndn-cpp/security//security-exception.hpp>
+#include <ndn-cpp/security/security-exception.hpp>
#include "../../c/util/crypto.h"
#include "../../encoding/der/der.hpp"
#include <ndn-cpp/security/certificate/public-key.hpp>
using namespace std;
-using namespace ndn::ptr_lib;
namespace ndn {
-shared_ptr<der::DerNode>
+ptr_lib::shared_ptr<der::DerNode>
PublicKey::toDer()
{
ndnboost::iostreams::stream<ndnboost::iostreams::array_source> is((const char*)keyDer_.buf (), keyDer_.size ());
@@ -29,7 +28,7 @@
static int RSA_OID[] = { 1, 2, 840, 113549, 1, 1, 1 };
-shared_ptr<PublicKey>
+ptr_lib::shared_ptr<PublicKey>
PublicKey::fromDer(const Blob& keyDer)
{
// Use a temporary pointer since d2i updates it.
@@ -39,7 +38,7 @@
throw UnrecognizedKeyFormatException("Error decoding public key DER");
RSA_free(publicKey);
- return shared_ptr<PublicKey>(new PublicKey(OID(vector<int>(RSA_OID, RSA_OID + sizeof(RSA_OID))), keyDer));
+ return ptr_lib::shared_ptr<PublicKey>(new PublicKey(OID(vector<int>(RSA_OID, RSA_OID + sizeof(RSA_OID))), keyDer));
}
Blob