--- a/src/core/model/log-macros-disabled.h	Wed Jul 29 19:47:25 2015 -0400
+++ b/src/core/model/log-macros-disabled.h	Wed Jul 29 20:00:46 2015 -0400
@@ -31,7 +31,7 @@
     {                                       \
       if (false)                            \
         {                                   \
-          Simulator::GetImplementation ()->GetStdLogStream () << msg;  \
+          ns3::Simulator::GetImplementation ()->GetStdLogStream () << msg; \
         }                                   \
     }                                       \
   while (false)

--- a/src/core/model/log-macros-enabled.h	Wed Jul 29 19:47:25 2015 -0400
+++ b/src/core/model/log-macros-enabled.h	Wed Jul 29 20:00:46 2015 -0400
@@ -38,8 +38,8 @@
       ns3::LogTimePrinter printer = ns3::LogGetTimePrinter ();  \
       if (printer != 0)                                         \
         {                                                       \
-          (*printer)(Simulator::GetImplementation ()->GetStdLogStream ());                 \
-          Simulator::GetImplementation ()->GetStdLogStream () << " ";                                     \
+          (*printer)(ns3::Simulator::GetImplementation ()->GetStdLogStream ());                 \
+          ns3::Simulator::GetImplementation ()->GetStdLogStream () << " ";                                     \
         }                                                       \
     }
 
@@ -55,8 +55,8 @@
       ns3::LogNodePrinter printer = ns3::LogGetNodePrinter ();  \
       if (printer != 0)                                         \
         {                                                       \
-          (*printer)(Simulator::GetImplementation ()->GetStdLogStream ());                 \
-          Simulator::GetImplementation ()->GetStdLogStream () << " ";                                     \
+          (*printer)(ns3::Simulator::GetImplementation ()->GetStdLogStream ());                 \
+          ns3::Simulator::GetImplementation ()->GetStdLogStream () << " ";                                     \
         }                                                       \
     }
 
@@ -69,7 +69,7 @@
 #define NS_LOG_APPEND_FUNC_PREFIX                               \
   if (g_log.IsEnabled (ns3::LOG_PREFIX_FUNC))                   \
     {                                                           \
-      Simulator::GetImplementation ()->GetStdLogStream () << g_log.Name () << ":" <<                      \
+      ns3::Simulator::GetImplementation ()->GetStdLogStream () << g_log.Name () << ":" <<                      \
       __FUNCTION__ << "(): ";                                   \
     }                                                           \
 
@@ -82,7 +82,7 @@
 #define NS_LOG_APPEND_LEVEL_PREFIX(level)                       \
   if (g_log.IsEnabled (ns3::LOG_PREFIX_LEVEL))                  \
     {                                                           \
-      Simulator::GetImplementation ()->GetStdLogStream () << "[" << g_log.GetLevelLabel (level) << "] ";  \
+      ns3::Simulator::GetImplementation ()->GetStdLogStream () << "[" << g_log.GetLevelLabel (level) << "] ";  \
     }                                                           \
 
 
@@ -100,7 +100,7 @@
  * \code
  *   if (var)
  *     {
- *       Simulator::GetImplementation ()->GetStdLogStream () << "[node " << var->GetObject<Node> ()->GetId () << "] ";
+ *       ns3::Simulator::GetImplementation ()->GetStdLogStream () << "[node " << var->GetObject<Node> ()->GetId () << "] ";
  *     }
  * \endcode
  */
@@ -156,7 +156,7 @@
           NS_LOG_APPEND_CONTEXT;                                \
           NS_LOG_APPEND_FUNC_PREFIX;                            \
           NS_LOG_APPEND_LEVEL_PREFIX (level);                   \
-          Simulator::GetImplementation ()->GetStdLogStream () << msg << std::endl;                        \
+          ns3::Simulator::GetImplementation ()->GetStdLogStream () << msg << std::endl;                        \
         }                                                       \
     }                                                           \
   while (false)
@@ -178,7 +178,7 @@
           NS_LOG_APPEND_TIME_PREFIX;                            \
           NS_LOG_APPEND_NODE_PREFIX;                            \
           NS_LOG_APPEND_CONTEXT;                                \
-          Simulator::GetImplementation ()->GetStdLogStream () << g_log.Name () << ":"                     \
+          ns3::Simulator::GetImplementation ()->GetStdLogStream () << g_log.Name () << ":"                     \
                     << __FUNCTION__ << "()" << std::endl;       \
         }                                                       \
     }                                                           \
@@ -215,10 +215,10 @@
           NS_LOG_APPEND_TIME_PREFIX;                            \
           NS_LOG_APPEND_NODE_PREFIX;                            \
           NS_LOG_APPEND_CONTEXT;                                \
-          Simulator::GetImplementation ()->GetStdLogStream () << g_log.Name () << ":"                     \
+          ns3::Simulator::GetImplementation ()->GetStdLogStream () << g_log.Name () << ":"                     \
                     << __FUNCTION__ << "(";                     \
-          ns3::ParameterLogger (Simulator::GetImplementation ()->GetStdLogStream ()) << parameters; \
-          Simulator::GetImplementation ()->GetStdLogStream () << ")" << std::endl;                        \
+          ns3::ParameterLogger (ns3::Simulator::GetImplementation ()->GetStdLogStream ()) << parameters; \
+          ns3::Simulator::GetImplementation ()->GetStdLogStream () << ")" << std::endl;                        \
         }                                                       \
     }                                                           \
   while (false)
@@ -235,7 +235,7 @@
   NS_LOG_CONDITION                                              \
   do                                    \
     {                                   \
-      Simulator::GetImplementation ()->GetStdLogStream () << msg << std::endl;    \
+      ns3::Simulator::GetImplementation ()->GetStdLogStream () << msg << std::endl;    \
     }                                   \
   while (false)