Removing unnecessary debug information. Adding missing virtual
destructors to base classes
diff --git a/helper/ccnb-parser/syntax-tree/ccnb-parser-base-tag.h b/helper/ccnb-parser/syntax-tree/ccnb-parser-base-tag.h
index 604ebce..15310a5 100644
--- a/helper/ccnb-parser/syntax-tree/ccnb-parser-base-tag.h
+++ b/helper/ccnb-parser/syntax-tree/ccnb-parser-base-tag.h
@@ -39,9 +39,6 @@
public:
std::list<Ptr<Block> > m_attrs; ///< \brief List of attributes, associated with this tag
std::list<Ptr<Block> > m_nestedTags; ///< \brief List of nested tags
-
-public:
- virtual ~BaseTag () { }
protected:
/**
diff --git a/helper/ccnb-parser/syntax-tree/ccnb-parser-block.cc b/helper/ccnb-parser/syntax-tree/ccnb-parser-block.cc
index 09bf96a..29e3fac 100644
--- a/helper/ccnb-parser/syntax-tree/ccnb-parser-block.cc
+++ b/helper/ccnb-parser/syntax-tree/ccnb-parser-block.cc
@@ -44,8 +44,6 @@
Ptr<Block> Block::ParseBlock (Buffer::Iterator &start)
{
- NS_LOG_DEBUG (">");
-
// std::cout << "<< pos: " << counter << "\n";
uint32_t value = 0;
@@ -91,7 +89,6 @@
Block::~Block ()
{
- NS_LOG_DEBUG ("<");
}
}
diff --git a/helper/ccnb-parser/visitors/ccnb-parser-no-argu-visitor.h b/helper/ccnb-parser/visitors/ccnb-parser-no-argu-visitor.h
index 6f6bcc2..ce3e712 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-no-argu-visitor.h
+++ b/helper/ccnb-parser/visitors/ccnb-parser-no-argu-visitor.h
@@ -44,6 +44,8 @@
virtual boost::any visit (Dtag& )=0; ///< \brief Method accepting DTAG block
virtual boost::any visit (Dattr&)=0; ///< \brief Method accepting DATTR block
virtual boost::any visit (Ext& )=0; ///< \brief Method accepting EXT block
+
+ virtual ~NoArguVisitor () { }
};
}
diff --git a/helper/ccnb-parser/visitors/ccnb-parser-visitor.h b/helper/ccnb-parser/visitors/ccnb-parser-visitor.h
index 24212d4..e0fac3a 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-visitor.h
+++ b/helper/ccnb-parser/visitors/ccnb-parser-visitor.h
@@ -44,6 +44,8 @@
virtual boost::any visit (Dtag&, boost::any)=0; ///< \brief Method accepting DTAG block
virtual boost::any visit (Dattr&, boost::any)=0; ///< \brief Method accepting DATTR block
virtual boost::any visit (Ext&, boost::any)=0; ///< \brief Method accepting EXT block
+
+ virtual ~Visitor () { }
};
}
diff --git a/helper/ccnb-parser/visitors/ccnb-parser-void-no-argu-visitor.h b/helper/ccnb-parser/visitors/ccnb-parser-void-no-argu-visitor.h
index 975c0c6..ad0ff74 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-void-no-argu-visitor.h
+++ b/helper/ccnb-parser/visitors/ccnb-parser-void-no-argu-visitor.h
@@ -43,6 +43,8 @@
virtual void visit (Dtag& )=0; ///< \brief Method accepting DTAG block
virtual void visit (Dattr&)=0; ///< \brief Method accepting DATTR block
virtual void visit (Ext& )=0; ///< \brief Method accepting EXT block
+
+ virtual ~VoidNoArguVisitor () { }
};
}
diff --git a/helper/ccnb-parser/visitors/ccnb-parser-void-visitor.h b/helper/ccnb-parser/visitors/ccnb-parser-void-visitor.h
index 9b45836..4fd228d 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-void-visitor.h
+++ b/helper/ccnb-parser/visitors/ccnb-parser-void-visitor.h
@@ -44,6 +44,8 @@
virtual void visit (Dtag&, boost::any)=0; ///< \brief Method accepting DTAG block
virtual void visit (Dattr&, boost::any)=0; ///< \brief Method accepting DATTR block
virtual void visit (Ext&, boost::any)=0; ///< \brief Method accepting EXT block
+
+ virtual ~VoidVisitor () { }
};
}
diff --git a/model/ccnx-bestroute-strategy.h b/model/ccnx-bestroute-strategy.h
index 8abaae9..d6f9a5a 100644
--- a/model/ccnx-bestroute-strategy.h
+++ b/model/ccnx-bestroute-strategy.h
@@ -45,16 +45,17 @@
class CcnxBestRouteStrategy : public CcnxForwardingStrategy
{
public:
- static TypeId GetTypeId (void);
+ static TypeId GetTypeId (void);
- CcnxBestRouteStrategy ();
+ CcnxBestRouteStrategy ();
- bool PropagateInterest (CcnxPitEntryContainer::type::iterator pitEntry,
- CcnxFibEntryContainer::type::iterator fibEntry,
- const Ptr<CcnxFace> &incomingFace,
- Ptr<CcnxInterestHeader> &header,
- const Ptr<const Packet> &packet,
- SendCallback ucb);
+ virtual bool
+ PropagateInterest (CcnxPitEntryContainer::type::iterator pitEntry,
+ CcnxFibEntryContainer::type::iterator fibEntry,
+ const Ptr<CcnxFace> &incomingFace,
+ Ptr<CcnxInterestHeader> &header,
+ const Ptr<const Packet> &packet,
+ SendCallback ucb);
};
} //namespace ns3
diff --git a/model/ccnx-fib.cc b/model/ccnx-fib.cc
index d473197..8daa034 100644
--- a/model/ccnx-fib.cc
+++ b/model/ccnx-fib.cc
@@ -198,6 +198,7 @@
void
CcnxFib::DoDispose (void)
{
+ clear ();
m_node = 0;
clear ();
Object::DoDispose ();
diff --git a/model/ccnx-flooding-strategy.h b/model/ccnx-flooding-strategy.h
index 5eb7a5d..b6c309d 100644
--- a/model/ccnx-flooding-strategy.h
+++ b/model/ccnx-flooding-strategy.h
@@ -18,7 +18,6 @@
* Author: Ilya Moiseenko <iliamo@cs.ucla.edu>
*/
-
#ifndef CCNX_FLOODING_STRATEGY_H
#define CCNX_FLOODING_STRATEGY_H
@@ -38,23 +37,24 @@
class CcnxInterestHeader;
/**
-* \ingroup ccnx
-* \brief Flooding strategy
-*/
+ * \ingroup ccnx
+ * \brief Flooding strategy
+ */
class CcnxFloodingStrategy : public CcnxForwardingStrategy
{
public:
- static TypeId GetTypeId (void);
+ static TypeId GetTypeId (void);
- CcnxFloodingStrategy ();
-
- bool PropagateInterest (CcnxPitEntryContainer::type::iterator pitEntry,
- CcnxFibEntryContainer::type::iterator fibEntry,
- const Ptr<CcnxFace> &incomingFace,
- Ptr<CcnxInterestHeader> &header,
- const Ptr<const Packet> &packet,
- SendCallback ucb);
+ CcnxFloodingStrategy ();
+
+ virtual bool
+ PropagateInterest (CcnxPitEntryContainer::type::iterator pitEntry,
+ CcnxFibEntryContainer::type::iterator fibEntry,
+ const Ptr<CcnxFace> &incomingFace,
+ Ptr<CcnxInterestHeader> &header,
+ const Ptr<const Packet> &packet,
+ SendCallback ucb);
};
} //namespace ns3
diff --git a/model/ccnx-forwarding-strategy.cc b/model/ccnx-forwarding-strategy.cc
index f048e6e..64fef94 100644
--- a/model/ccnx-forwarding-strategy.cc
+++ b/model/ccnx-forwarding-strategy.cc
@@ -41,6 +41,10 @@
{
}
+CcnxForwardingStrategy::~CcnxForwardingStrategy ()
+{
+}
+
void
CcnxForwardingStrategy::SetPit(Ptr<CcnxPit> pit)
{
diff --git a/model/ccnx-forwarding-strategy.h b/model/ccnx-forwarding-strategy.h
index 3f0f8ae..cdf9576 100644
--- a/model/ccnx-forwarding-strategy.h
+++ b/model/ccnx-forwarding-strategy.h
@@ -45,19 +45,22 @@
static TypeId GetTypeId (void);
CcnxForwardingStrategy ();
+ virtual ~CcnxForwardingStrategy ();
- void SetPit(Ptr<CcnxPit> pit);
+ void
+ SetPit (Ptr<CcnxPit> pit);
typedef
Callback<void, const Ptr<CcnxFace> &, const Ptr<CcnxInterestHeader> &, const Ptr<Packet> &>
SendCallback;
- virtual bool PropagateInterest (CcnxPitEntryContainer::type::iterator pitEntry,
- CcnxFibEntryContainer::type::iterator fibEntry,
- const Ptr<CcnxFace> &incomingFace,
- Ptr<CcnxInterestHeader> &header,
- const Ptr<const Packet> &packet,
- SendCallback ucb) = 0;
+ virtual bool
+ PropagateInterest (CcnxPitEntryContainer::type::iterator pitEntry,
+ CcnxFibEntryContainer::type::iterator fibEntry,
+ const Ptr<CcnxFace> &incomingFace,
+ Ptr<CcnxInterestHeader> &header,
+ const Ptr<const Packet> &packet,
+ SendCallback ucb) = 0;
Ptr<CcnxPit> GetPit();
private:
diff --git a/model/ccnx.cc b/model/ccnx.cc
index 0fe4b31..af551a6 100644
--- a/model/ccnx.cc
+++ b/model/ccnx.cc
@@ -38,4 +38,8 @@
return tid;
}
+Ccnx::~Ccnx ()
+{
+}
+
} // namespace ns3
diff --git a/model/ccnx.h b/model/ccnx.h
index cafa354..32e2f57 100644
--- a/model/ccnx.h
+++ b/model/ccnx.h
@@ -94,6 +94,7 @@
* \return interface ID
*/
static TypeId GetTypeId ();
+ virtual ~Ccnx ();
/**
* \brief Send an Interest packet to a specified face