model+apps+utils+examples+ci+docs: Update code for changes in ns-2.23
- Replace removed RandomVariable with RandomVariableStream
- Replace deprecated usages of AddTraceSource
- Update changed LogComponent interface
ci: This commit also integrates a script for Jenkins and Travis CI to
clone NS-3 and pybindgen repositories, so the code can be built.
docs: Update to reflect new home of ndnSIM and related sources
Change-Id: Ic14e1269bf15366b0041fd670c577053b6704dc7
Refs: #3122, #3123
diff --git a/utils/trie/random-policy.hpp b/utils/trie/random-policy.hpp
index 813dae5..1e2aa4a 100644
--- a/utils/trie/random-policy.hpp
+++ b/utils/trie/random-policy.hpp
@@ -22,7 +22,7 @@
/// @cond include_hidden
-#include "ns3/random-variable.h"
+#include "ns3/random-variable-stream.h"
#include <boost/intrusive/options.hpp>
#include <boost/intrusive/set.hpp>
@@ -89,9 +89,11 @@
type(Base& base)
: base_(base)
- , u_rand(0, std::numeric_limits<uint32_t>::max())
+ , u_rand(CreateObject<UniformRandomVariable>())
, max_size_(100)
{
+ u_rand->SetAttribute("Min", UintegerValue(0));
+ u_rand->SetAttribute("Max", UintegerValue(std::numeric_limits<uint32_t>::max()));
}
inline void
@@ -103,7 +105,7 @@
inline bool
insert(typename parent_trie::iterator item)
{
- get_order(item) = u_rand.GetValue();
+ get_order(item) = u_rand->GetValue();
if (max_size_ != 0 && policy_container::size() >= max_size_) {
if (MemberHookLess<Container>()(*item, *policy_container::begin())) {
@@ -157,7 +159,7 @@
private:
Base& base_;
- ns3::UniformVariable u_rand;
+ Ptr<UniformRandomVariable> u_rand;
size_t max_size_;
};
};