Correcting everything to the stage that everything compiles
diff --git a/model/ccnx.h b/model/ccnx.h
index 32e2f57..4d6f636 100644
--- a/model/ccnx.h
+++ b/model/ccnx.h
@@ -49,11 +49,10 @@
class i_mru {};
}
-#define MILLI_SECOND 1
-#define SECOND 1000
// default data size
-#define NDN_DEFAULT_DATA_SIZE 1024
-#define NDN_INTEREST_RESET_PERIOD (10*MILLI_SECOND)
+// #define NDN_DEFAULT_DATA_SIZE 1024
+// #define NDN_INTEREST_RESET_PERIOD (10*MILLI_SECOND)
+
/**
* \defgroup ccnx NDN abstraction
*
@@ -108,7 +107,7 @@
*/
virtual void
SendInterest (const Ptr<CcnxFace> &face,
- const Ptr<CcnxInterestHeader> &header,
+ const Ptr<const CcnxInterestHeader> &header,
const Ptr<Packet> &packet) = 0;
/**
@@ -123,7 +122,7 @@
*/
virtual void
SendContentObject (const Ptr<CcnxFace> &face,
- const Ptr<CcnxContentObjectHeader> &header,
+ const Ptr<const CcnxContentObjectHeader> &header,
const Ptr<Packet> &packet) = 0;
/**