1.1 --- a/AUTHORS	Wed Jul 30 06:30:42 2008 -0700
     1.2 +++ b/AUTHORS	Fri Aug 01 07:40:22 2008 -0700
     1.3 @@ -1,4 +1,4 @@
     1.4 -Raj Bhattarcharjea (raj.b@gatech.edu)
     1.5 +Raj Bhattacharjea (raj.b@gatech.edu)
     1.6  Gustavo Carneiro (gjc@inescporto.pt, gjcarneiro@gmail.com)
     1.7  Craig Dowell (craigdo@ee.washington.edu)
     1.8  Tom Henderson (tomhend@u.washington.edu)

     2.1 --- a/src/core/log.h	Wed Jul 30 06:30:42 2008 -0700
     2.2 +++ b/src/core/log.h	Fri Aug 01 07:40:22 2008 -0700
     2.3 @@ -151,7 +151,7 @@
     2.4  #define NS_LOG_APPEND_TIME_PREFIX                               \
     2.5    if (g_log.IsEnabled (ns3::LOG_PREFIX_TIME))                   \
     2.6      {                                                           \
     2.7 -      LogTimePrinter printer = LogGetTimePrinter ();            \
     2.8 +      ns3::LogTimePrinter printer = ns3::LogGetTimePrinter ();  \
     2.9        if (printer != 0)                                         \
    2.10          {                                                       \
    2.11            (*printer) (std::clog);                               \

     3.1 --- a/src/simulator/default-simulator-impl.cc	Wed Jul 30 06:30:42 2008 -0700
     3.2 +++ b/src/simulator/default-simulator-impl.cc	Fri Aug 01 07:40:22 2008 -0700
     3.3 @@ -154,8 +154,6 @@
     3.4    // If the simulator stopped naturally by lack of events, make a
     3.5    // consistency test to check that we didn't lose any events along the way.
     3.6    NS_ASSERT(!m_events->IsEmpty () || m_unscheduledEvents == 0);
     3.7 -
     3.8 -  m_log.close ();
     3.9  }
    3.10  
    3.11  void 

     4.1 --- a/src/simulator/default-simulator-impl.h	Wed Jul 30 06:30:42 2008 -0700
     4.2 +++ b/src/simulator/default-simulator-impl.h	Fri Aug 01 07:40:22 2008 -0700
     4.3 @@ -75,9 +75,6 @@
     4.4    uint32_t m_uid;
     4.5    uint32_t m_currentUid;
     4.6    uint64_t m_currentTs;
     4.7 -  std::ofstream m_log;
     4.8 -  std::ifstream m_inputLog;
     4.9 -  bool m_logEnable;
    4.10    // number of events that have been inserted but not yet scheduled,
    4.11    // not counting the "destroy" events; this is used for validation
    4.12    int m_unscheduledEvents;

     5.1 --- a/src/wscript	Wed Jul 30 06:30:42 2008 -0700
     5.2 +++ b/src/wscript	Fri Aug 01 07:40:22 2008 -0700
     5.3 @@ -51,7 +51,7 @@
     5.4      conf.sub_config('contrib')
     5.5  
     5.6      blddir = os.path.abspath(os.path.join(conf.m_blddir, conf.env.variant()))
     5.7 -    conf.env['NS3_MODULE_PATH'] = [blddir]
     5.8 +    conf.env.append_value('NS3_MODULE_PATH', blddir)
     5.9      if Params.g_options.enable_rpath:
    5.10          conf.env.append_value('RPATH', '-Wl,-rpath=%s' % (os.path.join(blddir),))
    5.11