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

include/ndn-cpp/c/common.h

diff --git a/include/ndn-cpp/c/common.h b/include/ndn-cpp/c/common.h
index c1706d5..d3d2f60 100644
--- a/include/ndn-cpp/c/common.h
+++ b/include/ndn-cpp/c/common.h
@@ -7,7 +7,8 @@
 #ifndef NDN_COMMON_H
 #define NDN_COMMON_H
 
-#include "../ndn-cpp-config.h"
+#include <ndn-cpp/ndn-cpp-config.h>
+
 #include <stdint.h>
 // TODO: Is stddef.h portable?
 #include <stddef.h>

include/ndn-cpp/data.hpp

diff --git a/include/ndn-cpp/data.hpp b/include/ndn-cpp/data.hpp
index 43615d3..f0de52f 100644
--- a/include/ndn-cpp/data.hpp
+++ b/include/ndn-cpp/data.hpp
@@ -313,10 +313,10 @@
   void 
   onChanged();
   
-  ptr_lib::shared_ptr<Signature> signature_;
   Name name_;
   MetaInfo metaInfo_;
   Blob content_;
+  ptr_lib::shared_ptr<Signature> signature_;
   SignedBlob defaultWireEncoding_;
 };