1.1 --- a/bindings/python/wscript	Wed Nov 05 14:08:54 2008 -0800
     1.2 +++ b/bindings/python/wscript	Wed Nov 05 14:09:43 2008 -0800
     1.3 @@ -118,6 +118,14 @@
     1.4          conf.report_optional_feature("python", "Python Bindings", False, str(ex))
     1.5          return
     1.6  
     1.7 +    # Fix a bug with WAF and g++ 4.3.2 (it does not include "(GCC") in
     1.8 +    # the output of g++ --version, so the WAF python detection fails
     1.9 +    # to recognize it is gcc)
    1.10 +    gcc_version = os.popen("%s --version" % conf.env['CXX']).readline()
    1.11 +    if '(GCC)' in gcc_version or 'g++' in gcc_version:
    1.12 +        conf.env.append_value('CXXFLAGS_PYEMBED','-fno-strict-aliasing')
    1.13 +        conf.env.append_value('CXXFLAGS_PYEXT','-fno-strict-aliasing')
    1.14 +
    1.15      ## Check for pybindgen
    1.16      if Params.g_options.pybindgen_checkout:
    1.17          fetch_pybindgen(conf)

     2.1 --- a/src/contrib/stats/sqlite-data-output.cc	Wed Nov 05 14:08:54 2008 -0800
     2.2 +++ b/src/contrib/stats/sqlite-data-output.cc	Wed Nov 05 14:09:43 2008 -0800
     2.3 @@ -33,7 +33,6 @@
     2.4  
     2.5  NS_LOG_COMPONENT_DEFINE("SqliteDataOutput");
     2.6  
     2.7 -
     2.8  //--------------------------------------------------------------
     2.9  //----------------------------------------------
    2.10  SqliteDataOutput::SqliteDataOutput() :
    2.11 @@ -232,7 +231,7 @@
    2.12      m_runLabel << "', '" <<
    2.13      key << "', '" <<
    2.14      variable << "', " <<
    2.15 -    val << ")";
    2.16 +    val.GetTimeStep() << ")";
    2.17    m_owner->Exec(sstr.str());
    2.18    // end SqliteDataOutput::SqliteOutputCallback::OutputSingleton
    2.19  }

     3.1 --- a/src/internet-stack/arp-cache.cc	Wed Nov 05 14:08:54 2008 -0800
     3.2 +++ b/src/internet-stack/arp-cache.cc	Wed Nov 05 14:09:43 2008 -0800
     3.3 @@ -232,6 +232,11 @@
     3.4        delete (*i).second;
     3.5      }
     3.6    m_arpCache.erase (m_arpCache.begin (), m_arpCache.end ());
     3.7 +  if (m_waitReplyTimer.IsRunning ())
     3.8 +    {
     3.9 +      NS_LOG_LOGIC ("Stopping WaitReplyTimer at " << Simulator::Now ().GetSeconds () << " due to ArpCache flush");
    3.10 +      m_waitReplyTimer.Cancel ();
    3.11 +    }
    3.12  }
    3.13  
    3.14  ArpCache::Entry *

     4.1 --- a/src/internet-stack/arp-l3-protocol.cc	Wed Nov 05 14:08:54 2008 -0800
     4.2 +++ b/src/internet-stack/arp-l3-protocol.cc	Wed Nov 05 14:09:43 2008 -0800
     4.3 @@ -221,7 +221,7 @@
     4.4              } 
     4.5            else if (entry->IsWaitReply ()) 
     4.6              {
     4.7 -              NS_FATAL_ERROR ("Test for possibly unreachable code-- please file a bug report if this is ever hit");
     4.8 +              NS_FATAL_ERROR ("Test for possibly unreachable code-- please file a bug report, with a test case, if this is ever hit");
     4.9              }
    4.10          } 
    4.11        else