commit db31e7ca6ff5fe3a4f467c593952335b2970d76c
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jul 09 21:48:59 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jul 09 21:48:59 2014 -0700
tree 404309a1dc1d77f7fa234c4c98820e12e079414f
parent 9fd46ba6c35eda1cbc8d53eff4c016115fca3211

build: Fixes and disabling PyNDN unless specifically requested

model/fib/ndn-fib-entry.cc

diff --git a/model/fib/ndn-fib-entry.cc b/model/fib/ndn-fib-entry.cc
index 229557c..f05140e 100644
--- a/model/fib/ndn-fib-entry.cc
+++ b/model/fib/ndn-fib-entry.cc
@@ -67,8 +67,8 @@
     }
   else
     {
-      m_rttVar = Time ((1 - NDN_RTO_BETA) * m_rttVar + NDN_RTO_BETA * Abs(m_sRtt - rttSample));
-      m_sRtt = Time ((1 - NDN_RTO_ALPHA) * m_sRtt + NDN_RTO_ALPHA * rttSample);
+      m_rttVar = Time ((1 - NDN_RTO_BETA) * m_rttVar + 1.0 * NDN_RTO_BETA * Abs(m_sRtt - rttSample));
+      m_sRtt = Time ((1 - NDN_RTO_ALPHA) * m_sRtt + 1.0 * NDN_RTO_ALPHA * rttSample);
     }
 }
 

wscript

diff --git a/wscript b/wscript
index 0301b35..72a7d3e 100644
--- a/wscript
+++ b/wscript
@@ -227,10 +227,6 @@
                  source = bld.path.ant_glob (["PyNDN/**/*.py"]),
                  install_from = "PyNDN",
                  install_path = bld.env['PyNDN_install_path'])
-        else:
-            bld (features = "py",
-                 source = bld.path.ant_glob (["PyNDN/**/*.py"]),
-                 install_from = ".")
 
 @TaskGen.feature('ns3fullmoduleheaders')
 @TaskGen.after_method('process_rule')
@@ -258,4 +254,3 @@
             task.set_outputs([dst_node])
         else:
             task.header_to_remove = dst_node
-