--- a/src/core/log.cc	Mon Apr 14 10:10:17 2008 -0700
+++ b/src/core/log.cc	Mon Apr 14 10:26:26 2008 -0700
@@ -358,9 +358,11 @@
     }
 }
 
+ParameterLogger::ParameterLogger ()
+  : m_itemNumber (0)
+{}
 
 ParameterLogger g_parameterLogger;
-EndParameterListStruct EndParameterList;
 
 
 } // namespace ns3

--- a/src/core/log.h	Mon Apr 14 10:10:17 2008 -0700
+++ b/src/core/log.h	Mon Apr 14 10:26:26 2008 -0700
@@ -94,60 +94,27 @@
 
 namespace ns3 {
 
-struct EndParameterListStruct {};
-extern EndParameterListStruct EndParameterList;
-
 class ParameterLogger : public std::ostream
 {
   int m_itemNumber;
-  const char *m_parameterName;
 public:
-  ParameterLogger ()
-    : m_itemNumber (0)
-  {}
+  ParameterLogger ();
 
   template<typename T>
   ParameterLogger& operator<< (T param)
   {
     switch (m_itemNumber)
       {
-      case 0: // first item is actually the function name
-        std::clog << param << " (";
-        break;
-      case 1: // first parameter
-        if (m_parameterName)
-          {
-            std::clog << m_parameterName << "=" << param;
-            m_parameterName = 0;
-          }
-        else
-          {
-            std::clog << param;
-          }
+      case 0: // first parameter
+        std::clog << param;
         break;
       default: // parameter following a previous parameter
-        if (m_parameterName)
-          {
-            std::clog << ", " << m_parameterName << "=" << param;
-            m_parameterName = 0;
-          }
-        else
-          {
-            std::clog << ", " << param;
-          }
+        std::clog << ", " << param;
         break;
       }
     m_itemNumber++;
     return *this;
   }
-  
-  ParameterLogger&
-  operator << (EndParameterListStruct dummy)
-  {
-    std::clog << ")" << std::endl;
-    m_itemNumber = 0;
-    return *this;
-  }
 };
 
 extern ParameterLogger g_parameterLogger;
@@ -217,9 +184,10 @@
     {                                                   \
       if (g_log.IsEnabled (ns3::LOG_PARAM))             \
         {                                               \
-          g_parameterLogger << __PRETTY_FUNCTION__      \
-                            << parameters               \
-                            << EndParameterList;        \
+          std::clog << g_log.Name () << ":"             \
+                    << __FUNCTION__ << "(";             \
+          g_parameterLogger << parameters;              \
+          std::clog << ")" << std::endl;                \
         }                                               \
     }                                                   \
   while (false)