commit f47109bf3668647d75004dbe5dbb2bd12e7b8a4d
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Jan 02 19:41:34 2013 -0800
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Jan 02 23:14:05 2013 -0800
tree 3e6c6fdb7c23207a28e708e997de6555e8bf66c4
parent d4d4dfae4f4e9e7106ca405b22249dc4b527979c

add Name and Selector classes

include/ccnx-wrapper.h

diff --git a/include/ccnx-wrapper.h b/include/ccnx-wrapper.h
index 9b50ae8..90089e7 100644
--- a/include/ccnx-wrapper.h
+++ b/include/ccnx-wrapper.h
@@ -1,21 +1,12 @@
 #ifndef CCNX_WRAPPER_H
 #define CCNX_WRAPPER_H
 
-extern "C" {
-#include <ccn/ccn.h>
-#include <ccn/charbuf.h>
-#include <ccn/keystore.h>
-#include <ccn/uri.h>
-#include <ccn/bloom.h>
-#include <ccn/signing.h>
-}
-
 #include <boost/thread/locks.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
 
 #include "ccnx-common.h"
-#include "ccnx-interest.h"
+#include "ccnx-name.h"
 #include "ccnx-closure.h"
 
 using namespace std;
@@ -46,7 +37,7 @@
   clearInterestFilter (const string &prefix);
 
   virtual int
-  sendInterest (const Interest &interest, Closure *closure);
+  sendInterest (const string &interest, Closure *closure);
 
   virtual int
   publishData (const string &name, const unsigned char *buf, size_t len, int freshness);