--- a/src/simulator/time.cc	Mon Apr 14 16:19:17 2008 -0700
+++ b/src/simulator/time.cc	Thu Apr 17 13:42:25 2008 -0700
@@ -41,7 +41,7 @@
 
 static GlobalValue g_precisionDefaultValue ("TimeStepPrecision", 
                                             "The time unit of the internal 64 bit integer time.",
-                                            Enum (NS),
+                                            EnumValue (NS),
                                             MakeEnumChecker (NS, "NS",
                                                              S, "S",
                                                              MS, "MS",
@@ -53,14 +53,15 @@
 precision_t
 Get (void)
 {
-  Enum v = g_precisionDefaultValue.GetValue ();
+  EnumValue v;
+  g_precisionDefaultValue.GetValue (v);
   return (precision_t) v.Get ();
 }
 
 void 
 Set (precision_t precision)
 {
-  g_precisionDefaultValue.SetValue (Enum (precision));
+  g_precisionDefaultValue.SetValue (EnumValue (precision));
   g_tsPrecFactor = (uint64_t)pow(10, precision);
 }
 
@@ -301,20 +302,6 @@
   return unitValue;
 }
 
-TimeUnit<1>::TimeUnit (Attribute value)
-{
-  const TimeValue *v = value.DynCast<const TimeValue *> ();
-  if (v == 0)
-    {
-      NS_FATAL_ERROR ("Unexpected type of value. Expected \"TimeValue\"");
-    }
-  *this = v->Get ();
-}
-TimeUnit<1>::operator Attribute () const
-{
-  return Attribute (ns3::Create<TimeValue> (*this));
-}
-
 ATTRIBUTE_VALUE_IMPLEMENT (Time);
 ATTRIBUTE_CHECKER_IMPLEMENT (Time);
 
@@ -491,12 +478,12 @@
 
   TimeStepPrecision::Set (TimeStepPrecision::NS);
 
-  Config::SetGlobal ("TimeStepPrecision", String ("S"));
-  Config::SetGlobal ("TimeStepPrecision", String ("MS"));
-  Config::SetGlobal ("TimeStepPrecision", String ("US"));
-  Config::SetGlobal ("TimeStepPrecision", String ("NS"));
-  Config::SetGlobal ("TimeStepPrecision", String ("PS"));
-  Config::SetGlobal ("TimeStepPrecision", String ("FS"));
+  Config::SetGlobal ("TimeStepPrecision", StringValue ("S"));
+  Config::SetGlobal ("TimeStepPrecision", StringValue ("MS"));
+  Config::SetGlobal ("TimeStepPrecision", StringValue ("US"));
+  Config::SetGlobal ("TimeStepPrecision", StringValue ("NS"));
+  Config::SetGlobal ("TimeStepPrecision", StringValue ("PS"));
+  Config::SetGlobal ("TimeStepPrecision", StringValue ("FS"));
 
 
   Time tooBig = TimeStep (0x8000000000000000LL);