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/endorse-certificate.cpp

diff --git a/src/endorse-certificate.cpp b/src/endorse-certificate.cpp
index 3aef18e..b5c94ad 100644
--- a/src/endorse-certificate.cpp
+++ b/src/endorse-certificate.cpp
@@ -12,7 +12,7 @@
 #include "endorse-extension.pb.h"
 #include <boost/iostreams/stream.hpp>
 
-using namespace std;
+
 using namespace ndn;
 
 namespace chronos{
@@ -23,9 +23,9 @@
 const std::vector<std::string> EndorseCertificate::DEFAULT_ENDORSE_LIST = std::vector<std::string>();
 
 Chronos::EndorseExtensionMsg&
-operator << (Chronos::EndorseExtensionMsg& endorseExtension, const vector<string>& endorseList)
+operator << (Chronos::EndorseExtensionMsg& endorseExtension, const std::vector<std::string>& endorseList)
 { 
-  vector<string>::const_iterator it = endorseList.begin();
+  std::vector<std::string>::const_iterator it = endorseList.begin();
   for(; it != endorseList.end(); it++)
     endorseExtension.add_endorseentry()->set_name(*it);
 
@@ -33,7 +33,7 @@
 }
 
 Chronos::EndorseExtensionMsg&
-operator >> (Chronos::EndorseExtensionMsg& endorseExtension, vector<string>& endorseList)
+operator >> (Chronos::EndorseExtensionMsg& endorseExtension, std::vector<std::string>& endorseList)
 {
   for(int i = 0; i < endorseExtension.endorseentry_size(); i ++)
     endorseList.push_back(endorseExtension.endorseentry(i).name());
@@ -43,7 +43,7 @@
 
 EndorseCertificate::EndorseCertificate(const IdentityCertificate& kskCertificate,
                                        const Profile& profile,
-                                       const vector<string>& endorseList)
+                                       const std::vector<std::string>& endorseList)
   : Certificate()
   , m_profile(profile)
   , m_endorseList(endorseList)
@@ -75,7 +75,7 @@
 
 EndorseCertificate::EndorseCertificate(const EndorseCertificate& endorseCertificate,
                                        const Name& signer,
-                                       const vector<string>& endorseList)
+                                       const std::vector<std::string>& endorseList)
   : Certificate()
   , m_keyName(endorseCertificate.m_keyName)
   , m_signer(signer)
@@ -110,7 +110,7 @@
                                        const time::system_clock::TimePoint& notAfter,
                                        const Name& signer,
                                        const Profile& profile,
-                                       const vector<string>& endorseList)
+                                       const std::vector<std::string>& endorseList)
   : Certificate()
   , m_keyName(keyName)
   , m_signer(signer)