From d8a560820bcf02c2158e380e170dd39de7b2429d Mon Sep 17 00:00:00 2001
From: "Peter D. Barnes, Jr." <barnes26@llnl.gov>
Date: Fri, 24 May 2013 12:50:02 -0700
Subject: [PATCH] Revert ed82eb2702d0 on wifi/model/wifi-mad-header.cc to
 diagnose valgrind error.

---
 src/wifi/model/wifi-mac-header.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/wifi/model/wifi-mac-header.cc b/src/wifi/model/wifi-mac-header.cc
index d696ce721..a711770c1 100644
--- a/src/wifi/model/wifi-mac-header.cc
+++ b/src/wifi/model/wifi-mac-header.cc
@@ -884,11 +884,9 @@ WifiMacHeader::GetSize (void) const
 const char *
 WifiMacHeader::GetTypeString (void) const
 {
-  std::string typeString;
-  
 #define FOO(x) \
 case WIFI_MAC_ ## x: \
-  typeString = # x; \
+  return # x; \
   break;
 
   switch (GetType ())
@@ -932,7 +930,8 @@ case WIFI_MAC_ ## x: \
       return "ERROR";
     }
 #undef FOO
-  return typeString.c_str ();
+  // needed to make gcc 4.0.1 ppc darwin happy.
+  return "BIG_ERROR";
 }
 
 TypeId