diff -r 26ce090786bc src/node/mac48-address.cc
--- a/src/node/mac48-address.cc	Mon Jul 28 18:55:42 2008 +0100
+++ b/src/node/mac48-address.cc	Mon Jul 28 19:35:03 2008 +0100
@@ -108,12 +108,17 @@
   return Address (GetType (), m_address, 6);
 }
 Mac48Address 
-Mac48Address::ConvertFrom (const Address &address)
+Mac48AddressConvertFrom (const Address &address)
 {
-  NS_ASSERT (address.CheckCompatible (GetType (), 6));
+  NS_ASSERT (address.CheckCompatible (Mac48Address::GetType (), 6));
   Mac48Address retval;
   address.CopyTo (retval.m_address);
   return retval;
+}
+Mac48Address 
+Mac48Address::ConvertFrom (const Address &address)
+{
+  return Mac48AddressConvertFrom (address);
 }
 Mac48Address 
 Mac48Address::Allocate (void)
diff -r 26ce090786bc src/node/mac48-address.h
--- a/src/node/mac48-address.h	Mon Jul 28 18:55:42 2008 +0100
+++ b/src/node/mac48-address.h	Mon Jul 28 19:35:03 2008 +0100
@@ -24,6 +24,7 @@
 #include <ostream>
 #include "ns3/attribute.h"
 #include "ns3/attribute-helper.h"
+#include "ns3/deprecated.h"
 
 namespace ns3 {
 
@@ -70,11 +71,13 @@
    * \param address a polymorphic address
    * \returns a new Mac48Address from the polymorphic address
    * 
-   * This function performs a type check and asserts if the
+   * Deprecated.  This function performs a type check and asserts if the
    * type of the input address is not compatible with an
    * Mac48Address.
    */
-  static Mac48Address ConvertFrom (const Address &address);
+  static Mac48Address ConvertFrom (const Address &address) NS_DEPRECATED;
+  friend Mac48Address Mac48AddressConvertFrom (const Address &address);
+
   /**
    * \returns true if the address matches, false otherwise.
    */