--- a/src/common/packet-metadata.cc	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/common/packet-metadata.cc	Fri Aug 03 17:26:10 2007 +0200
@@ -1112,7 +1112,7 @@
 class HistoryHeader : public Header
 {
 public:
-  static const char *GetUid (void);
+  static std::string GetUid (void);
   HistoryHeader ();
   bool IsOk (void) const;
 private:
@@ -1125,12 +1125,12 @@
 };
 
 template <int N>
-const char *
+std::string
 HistoryHeader<N>::GetUid (void)
 {
   std::ostringstream oss;
   oss << N << "HistoryHeader.ns3";
-  return oss.str ().c_str ();
+  return oss.str ();
 }
 
 template <int N>
@@ -1191,7 +1191,7 @@
 class HistoryTrailer : public Trailer
 {
 public:
-  static const char *GetUid (void);
+  static std::string GetUid (void);
   HistoryTrailer ();
   bool IsOk (void) const;
 private:
@@ -1204,12 +1204,12 @@
 };
 
 template <int N>
-const char *
+std::string
 HistoryTrailer<N>::GetUid (void)
 {
   std::ostringstream oss;
   oss << N << "HistoryTrailer.ns3";
-  return oss.str ().c_str ();
+  return oss.str ();
 }
 
 

--- a/src/internet-node/arp-header.cc	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/internet-node/arp-header.cc	Fri Aug 03 17:26:10 2007 +0200
@@ -25,7 +25,7 @@
 
 namespace ns3 {
 
-const char *
+std::string
 ArpHeader::GetUid (void)
 {
   return "ArpHeader.ns3";

--- a/src/internet-node/arp-header.h	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/internet-node/arp-header.h	Fri Aug 03 17:26:10 2007 +0200
@@ -25,6 +25,7 @@
 #include "ns3/header.h"
 #include "ns3/mac-address.h"
 #include "ns3/ipv4-address.h"
+#include <string>
 
 namespace ns3 {
 /**
@@ -33,7 +34,7 @@
 class ArpHeader : public Header 
 {
 public:
-  static const char *GetUid (void);
+  static std::string GetUid (void);
 
   virtual ~ArpHeader ();
 

--- a/src/internet-node/udp-header.cc	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/internet-node/udp-header.cc	Fri Aug 03 17:26:10 2007 +0200
@@ -26,7 +26,7 @@
 
 bool UdpHeader::m_calcChecksum = false;
 
-const char *
+std::string
 UdpHeader::GetUid (void)
 {
   return "UdpHeader.ns3";

--- a/src/internet-node/udp-header.h	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/internet-node/udp-header.h	Fri Aug 03 17:26:10 2007 +0200
@@ -23,6 +23,7 @@
 #define UDP_HEADER_H
 
 #include <stdint.h>
+#include <string>
 #include "ns3/header.h"
 #include "ns3/ipv4-address.h"
 
@@ -33,7 +34,7 @@
 class UdpHeader : public Header 
 {
 public:
-  static const char *GetUid (void);
+  static std::string GetUid (void);
 
   /**
    * \brief Constructor

--- a/src/node/ethernet-header.cc	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/node/ethernet-header.cc	Fri Aug 03 17:26:10 2007 +0200
@@ -29,7 +29,7 @@
 
 namespace ns3 {
 
-const char *
+std::string
 EthernetHeader::GetUid (void)
 {
   return "EthernetHeader.ns3";

--- a/src/node/ethernet-header.h	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/node/ethernet-header.h	Fri Aug 03 17:26:10 2007 +0200
@@ -24,6 +24,7 @@
 
 #include "ns3/header.h"
 #include "ns3/mac-address.h"
+#include <string>
 
 namespace ns3 {
 
@@ -48,7 +49,7 @@
 class EthernetHeader : public Header 
 {
 public:
-  static const char *GetUid (void);
+  static std::string GetUid (void);
 
   /**
    * \brief Construct a null ethernet header

--- a/src/node/ethernet-trailer.cc	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/node/ethernet-trailer.cc	Fri Aug 03 17:26:10 2007 +0200
@@ -30,7 +30,7 @@
 
 bool EthernetTrailer::m_calcFcs = false;
 
-const char *
+std::string
 EthernetTrailer::GetUid (void)
 {
   return "EthernetTrailer.ns3";

--- a/src/node/ethernet-trailer.h	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/node/ethernet-trailer.h	Fri Aug 03 17:26:10 2007 +0200
@@ -24,6 +24,7 @@
 
 #include "ns3/trailer.h"
 #include "ns3/packet.h"
+#include <string>
 
 namespace ns3 {
 /**
@@ -36,7 +37,7 @@
 class EthernetTrailer : public Trailer 
 {
 public:
-  static const char *GetUid (void);
+  static std::string GetUid (void);
 
   /**
    * \brief Construct a null ethernet trailer

--- a/src/node/llc-snap-header.cc	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/node/llc-snap-header.cc	Fri Aug 03 17:26:10 2007 +0200
@@ -19,13 +19,14 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
+#include "llc-snap-header.h"
 #include "ns3/assert.h"
+#include <string>
 
-#include "llc-snap-header.h"
 
 namespace ns3 {
 
-const char *
+std::string
 LlcSnapHeader::GetUid (void)
 {
   return "LlcSnapHeader.ns3";

--- a/src/node/llc-snap-header.h	Fri Aug 03 17:00:40 2007 +0200
+++ b/src/node/llc-snap-header.h	Fri Aug 03 17:26:10 2007 +0200
@@ -23,6 +23,7 @@
 #define LLC_SNAP_HEADER_H
 
 #include <stdint.h>
+#include <string>
 #include "ns3/header.h"
 
 namespace ns3 {
@@ -30,7 +31,7 @@
 class LlcSnapHeader : public Header 
 {
 public:
-  static const char *GetUid (void);
+  static std::string GetUid (void);
 
   LlcSnapHeader ();
   virtual ~LlcSnapHeader ();