--- a/bindings/python/wscript Wed Nov 05 14:08:54 2008 -0800
+++ b/bindings/python/wscript Wed Nov 05 14:09:43 2008 -0800
@@ -118,6 +118,14 @@
conf.report_optional_feature("python", "Python Bindings", False, str(ex))
return
+ # Fix a bug with WAF and g++ 4.3.2 (it does not include "(GCC") in
+ # the output of g++ --version, so the WAF python detection fails
+ # to recognize it is gcc)
+ gcc_version = os.popen("%s --version" % conf.env['CXX']).readline()
+ if '(GCC)' in gcc_version or 'g++' in gcc_version:
+ conf.env.append_value('CXXFLAGS_PYEMBED','-fno-strict-aliasing')
+ conf.env.append_value('CXXFLAGS_PYEXT','-fno-strict-aliasing')
+
## Check for pybindgen
if Params.g_options.pybindgen_checkout:
fetch_pybindgen(conf)
--- a/src/contrib/stats/sqlite-data-output.cc Wed Nov 05 14:08:54 2008 -0800
+++ b/src/contrib/stats/sqlite-data-output.cc Wed Nov 05 14:09:43 2008 -0800
@@ -33,7 +33,6 @@
NS_LOG_COMPONENT_DEFINE("SqliteDataOutput");
-
//--------------------------------------------------------------
//----------------------------------------------
SqliteDataOutput::SqliteDataOutput() :
@@ -232,7 +231,7 @@
m_runLabel << "', '" <<
key << "', '" <<
variable << "', " <<
- val << ")";
+ val.GetTimeStep() << ")";
m_owner->Exec(sstr.str());
// end SqliteDataOutput::SqliteOutputCallback::OutputSingleton
}
--- a/src/internet-stack/arp-cache.cc Wed Nov 05 14:08:54 2008 -0800
+++ b/src/internet-stack/arp-cache.cc Wed Nov 05 14:09:43 2008 -0800
@@ -232,6 +232,11 @@
delete (*i).second;
}
m_arpCache.erase (m_arpCache.begin (), m_arpCache.end ());
+ if (m_waitReplyTimer.IsRunning ())
+ {
+ NS_LOG_LOGIC ("Stopping WaitReplyTimer at " << Simulator::Now ().GetSeconds () << " due to ArpCache flush");
+ m_waitReplyTimer.Cancel ();
+ }
}
ArpCache::Entry *
--- a/src/internet-stack/arp-l3-protocol.cc Wed Nov 05 14:08:54 2008 -0800
+++ b/src/internet-stack/arp-l3-protocol.cc Wed Nov 05 14:09:43 2008 -0800
@@ -221,7 +221,7 @@
}
else if (entry->IsWaitReply ())
{
- NS_FATAL_ERROR ("Test for possibly unreachable code-- please file a bug report if this is ever hit");
+ NS_FATAL_ERROR ("Test for possibly unreachable code-- please file a bug report, with a test case, if this is ever hit");
}
}
else