commit 49e2e4cbbf759d9fe7338e8ce95735a51e590768
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat May 06 13:42:57 2017 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat May 06 13:42:57 2017 -0700
tree fb04c7bccec79edb8566e1e8de286ff974abc103
parent b1ba9c9e3555efd91e17e06454f44e014e9d6a9c

A few code reorganizations

Change-Id: If4632fecc7085e5448226c2061e08546757eda9b

core/merkle-tree.hpp

diff --git a/core/merkle-tree.hpp b/core/merkle-tree.hpp
index f1baa46..c388fe9 100644
--- a/core/merkle-tree.hpp
+++ b/core/merkle-tree.hpp
@@ -27,7 +27,8 @@
 #include "sub-tree-binary.hpp"
 #include <vector>
 
-namespace nsl {
+namespace ndn {
+namespace delorean {
 
 class MerkleTree
 {
@@ -103,6 +104,7 @@
   std::map<size_t, shared_ptr<SubTreeBinary>> m_pendingTrees;
 };
 
-}// namespace nsl
+} // namespace delorean
+} // namespace ndn
 
 #endif // NDN_DELOREAN_CORE_MERKLE_TREE_HPP