--- a/src/core/callback.cc	Fri Jul 23 13:39:46 2010 +0200
+++ b/src/core/callback.cc	Sat Jul 24 18:19:04 2010 +0200
@@ -35,12 +35,16 @@
 
 ATTRIBUTE_CHECKER_IMPLEMENT (Callback);
 
+} // namespace ns3
+
 #if (__GNUC__ >= 3)
 
 #include <stdlib.h>
 #include <cxxabi.h>
 #include "log.h"
 
+namespace ns3 {
+
 std::string
 CallbackBase::Demangle(const std::string& mangled)
 {
@@ -76,14 +80,15 @@
     return ret;
 }
 
+} // namespace ns3
+
 #else
 
 std::string
-CallbackBase::Demangle(const std::string& mangled)
+ns3::CallbackBase::Demangle(const std::string& mangled)
 {
     return mangled;
 }
 
 #endif
 
-} // namespace ns3