commit b1b7f5dff582a6e1fa51a484c430b7b46cab9e44
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 09 09:59:43 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 09 09:59:43 2012 -0700
tree 23159ae1bf8dc64f8cdd62e4e52f7abef2913034
parent ff6e369002b3ffc180125612445510fce224a086

Small corrections

model/forwarding-strategy/fw-stats.h

diff --git a/model/forwarding-strategy/fw-stats.h b/model/forwarding-strategy/fw-stats.h
index 67f2763..69149f3 100644
--- a/model/forwarding-strategy/fw-stats.h
+++ b/model/forwarding-strategy/fw-stats.h
@@ -46,6 +46,10 @@
    */
   FwStats ();
 
+  inline
+  const ::ndnSIM::StatsTree &
+  GetStatsTree () const;  
+
   virtual void
   OnInterest (const Ptr<CcnxFace> &face,
               Ptr<CcnxInterestHeader> &header,
@@ -112,6 +116,12 @@
   typedef BestRoute super;
 };
 
+const ::ndnSIM::StatsTree &
+FwStats::GetStatsTree () const
+{
+  return m_stats;
+}
+
 } // namespace ndnSIM
 } // namespace ns3
 

plugins/topology/annotated-topology-reader.cc

diff --git a/plugins/topology/annotated-topology-reader.cc b/plugins/topology/annotated-topology-reader.cc
index 7b68046..9dcbc9d 100644
--- a/plugins/topology/annotated-topology-reader.cc
+++ b/plugins/topology/annotated-topology-reader.cc
@@ -285,7 +285,8 @@
 AnnotatedTopologyReader::ApplySettings ()
 {
 #ifdef NS3_MPI
-  if (MpiInterface::GetSize () != m_requiredPartitions)
+  if (MpiInterface::IsEnabled () &&
+      MpiInterface::GetSize () != m_requiredPartitions)
     {
       std::cerr << "MPI interface is enabled, but number of partitions (" << MpiInterface::GetSize ()
                 << ") is not equal to number of partitions in the topology (" << m_requiredPartitions << ")";