# HG changeset patch # User John Abraham # Date 1380653113 25200 # Node ID bba8452a580f1d5a4b28ac8411998e5fd4e98228 # Parent 1a23700857d81738b324aa18dbf7f3554a1dcdcc Fixes for crashing examples diff -r 1a23700857d8 -r bba8452a580f examples/ipv6/test-ipv6.cc --- a/examples/ipv6/test-ipv6.cc Tue Oct 01 10:11:14 2013 -0700 +++ b/examples/ipv6/test-ipv6.cc Tue Oct 01 11:45:13 2013 -0700 @@ -23,6 +23,9 @@ #include "ns3/ipv6-address.h" #include "ns3/node.h" #include "ns3/mac48-address.h" +#ifdef WIN32 +#include "ns3/simulator.h" +#endif NS_LOG_COMPONENT_DEFINE ("TestIpv6"); @@ -65,5 +68,8 @@ Ipv6Address ipv6address = Ipv6Address::MakeAutoconfiguredAddress (m_addresses[i], prefix2); NS_LOG_INFO ("address = " << ipv6address); } +#ifdef WIN32 + Simulator::Run (); +#endif } diff -r 1a23700857d8 -r bba8452a580f examples/tutorial/fourth.cc --- a/examples/tutorial/fourth.cc Tue Oct 01 10:11:14 2013 -0700 +++ b/examples/tutorial/fourth.cc Tue Oct 01 11:45:13 2013 -0700 @@ -18,6 +18,9 @@ #include "ns3/uinteger.h" #include "ns3/traced-value.h" #include "ns3/trace-source-accessor.h" +#ifdef WIN32 +#include "ns3/core-module.h" +#endif #include @@ -55,4 +58,7 @@ myObject->TraceConnectWithoutContext ("MyInteger", MakeCallback (&IntTrace)); myObject->m_myInt = 1234; +#ifdef WIN32 + Simulator::Run (); +#endif } diff -r 1a23700857d8 -r bba8452a580f windows/ns-3-dev/applications/applications.vcxproj --- a/windows/ns-3-dev/applications/applications.vcxproj Tue Oct 01 10:11:14 2013 -0700 +++ b/windows/ns-3-dev/applications/applications.vcxproj Tue Oct 01 11:45:13 2013 -0700 @@ -73,6 +73,7 @@ + @@ -97,6 +98,7 @@ + diff -r 1a23700857d8 -r bba8452a580f windows/ns-3-dev/applications/applications.vcxproj.filters --- a/windows/ns-3-dev/applications/applications.vcxproj.filters Tue Oct 01 10:11:14 2013 -0700 +++ b/windows/ns-3-dev/applications/applications.vcxproj.filters Tue Oct 01 11:45:13 2013 -0700 @@ -75,6 +75,9 @@ helper + + helper + @@ -143,5 +146,8 @@ helper + + helper + \ No newline at end of file diff -r 1a23700857d8 -r bba8452a580f windows/ns-3-dev/ns-3-dev.v11.suo Binary file windows/ns-3-dev/ns-3-dev.v11.suo has changed