src: Creating daemon/common.hpp for all generic includes and import of commonly used abstractions to ndn namespace
This commit also update CS interface (find should return
shared_ptr<Data>, CS entry is internal to CS, the design diagrams are
corrected too).
Change-Id: Ib6377b6d9b8478640ac35d3cfb6c9180cc57c4fe
diff --git a/daemon/table/cs.hpp b/daemon/table/cs.hpp
index 67283b6..c1c3e37 100644
--- a/daemon/table/cs.hpp
+++ b/daemon/table/cs.hpp
@@ -4,18 +4,18 @@
* See COPYING for copyright and distribution information.
*/
-#ifndef NFD_TABLE_CS_H
-#define NFD_TABLE_CS_H
-#include <boost/shared_ptr.hpp>
-#include <ndn-cpp-dev/interest.hpp>
-#include <ndn-cpp-dev/data.hpp>
+#ifndef NFD_TABLE_CS_HPP
+#define NFD_TABLE_CS_HPP
+
+#include "common.hpp"
#include "cs-entry.hpp"
+
namespace ndn {
/** \class Cs
* \brief represents the ContentStore
*/
-class Cs : boost::noncopyable
+class Cs : noncopyable
{
public:
Cs();
@@ -30,14 +30,15 @@
* \return{ whether the Data is added }
*/
bool
- insert(boost::shared_ptr<Data> data);
+ insert(shared_ptr<Data> data);
/** \brief finds the best match Data for an Interest
* \return{ the best match, if any; otherwise null }
*/
- boost::shared_ptr<cs::Entry>
+ shared_ptr<Data>
find(const Interest& interest);
};
-};//namespace ndn
-#endif//NFD_TABLE_CS_H
+} // namespace ndn
+
+#endif // NFD_TABLE_CS_HPP