Mercurial Mercurial > jabraham3 > ns-3-win2 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes for crashing examples
authorJohn Abraham
Tue, 01 Oct 2013 11:45:13 -0700
changeset 10287 bba8452a580f
parent 10286 1a23700857d8
child 10288 ded3ce073b3a
Fixes for crashing examples
examples/ipv6/test-ipv6.cc file | annotate | diff | comparison | revisions
examples/tutorial/fourth.cc file | annotate | diff | comparison | revisions
windows/ns-3-dev/applications/applications.vcxproj file | annotate | diff | comparison | revisions
windows/ns-3-dev/applications/applications.vcxproj.filters file | annotate | diff | comparison | revisions
windows/ns-3-dev/ns-3-dev.v11.suo file | annotate | diff | comparison | revisions 
--- 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
 }
 
--- 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 <iostream>
 
@@ -55,4 +58,7 @@
   myObject->TraceConnectWithoutContext ("MyInteger", MakeCallback (&IntTrace));
 
   myObject->m_myInt = 1234;
+#ifdef WIN32
+  Simulator::Run ();
+#endif
 }
--- 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 @@
     <ClCompile Include="..\..\..\src\applications\helper\on-off-helper.cc" />
     <ClCompile Include="..\..\..\src\applications\helper\packet-sink-helper.cc" />
     <ClCompile Include="..\..\..\src\applications\helper\ping6-helper.cc" />
+    <ClCompile Include="..\..\..\src\applications\helper\radvd-helper.cc" />
     <ClCompile Include="..\..\..\src\applications\helper\udp-client-server-helper.cc" />
     <ClCompile Include="..\..\..\src\applications\helper\udp-echo-helper.cc" />
     <ClCompile Include="..\..\..\src\applications\helper\v4ping-helper.cc" />
@@ -97,6 +98,7 @@
     <ClInclude Include="..\..\..\src\applications\helper\on-off-helper.h" />
     <ClInclude Include="..\..\..\src\applications\helper\packet-sink-helper.h" />
     <ClInclude Include="..\..\..\src\applications\helper\ping6-helper.h" />
+    <ClInclude Include="..\..\..\src\applications\helper\radvd-helper.h" />
     <ClInclude Include="..\..\..\src\applications\helper\udp-client-server-helper.h" />
     <ClInclude Include="..\..\..\src\applications\helper\udp-echo-helper.h" />
     <ClInclude Include="..\..\..\src\applications\helper\v4ping-helper.h" />
--- 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 @@
     <ClCompile Include="..\..\..\src\applications\helper\v4ping-helper.cc">
       <Filter>helper</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\applications\helper\radvd-helper.cc">
+      <Filter>helper</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\applications\model\bulk-send-application.h">
@@ -143,5 +146,8 @@
     <ClInclude Include="..\..\..\src\applications\helper\v4ping-helper.h">
       <Filter>helper</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\applications\helper\radvd-helper.h">
+      <Filter>helper</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
Binary file windows/ns-3-dev/ns-3-dev.v11.suo has changed
jabraham3/ns-3-win2