--- a/src/core/uid-manager.cc	Mon Aug 25 15:21:01 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2007 INRIA
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
- */
-#include "uid-manager.h"
-#include "fatal-error.h"
-#include "assert.h"
-
-
-namespace ns3 {
-
-
-uint32_t 
-UidManager::Allocate (std::string name)
-{
-  for (NameList::iterator i = m_nameList.begin (); i != m_nameList.end (); i++)
-    {
-      if ((*i) == name)
-	{
-	  NS_FATAL_ERROR ("Trying to allocate twice the same uid: " << name);
-	}
-    }
-  m_nameList.push_back (name);
-  return m_nameList.size ();
-}
-
-uint32_t 
-UidManager::LookupByName (std::string name)
-{
-  uint32_t j = 0;
-  for (NameList::iterator i = m_nameList.begin (); i != m_nameList.end (); i++)
-    {
-      j++;
-      if ((*i) == name)
-        {
-          return j;
-        }
-    }
-  return 0;
-}
-
-std::string 
-UidManager::LookupByUid (uint32_t uid)
-{
-  NS_ASSERT (uid > 0);
-  NS_ASSERT (m_nameList.size () >= uid);
-  return m_nameList[uid-1];
-}
-
-} // namespace ns3

--- a/src/core/uid-manager.h	Mon Aug 25 15:21:01 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2007 INRIA
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
- */
-#ifndef UID_MANAGER_H
-#define UID_MANAGER_H
-
-#include <stdint.h>
-#include <string>
-#include <vector>
-
-namespace ns3 {
-
-/**
- * zero is never a valid uid value.
- */
-class UidManager
-{
-public:
-  uint32_t LookupByName (std::string name);
-  std::string LookupByUid (uint32_t uid);
-  uint32_t Allocate (std::string name);
-private:
-  typedef std::vector<std::string> NameList;
-  NameList m_nameList;
-};
-
-} // namespace ns3
-
-
-#endif /* UID_MANAGER_H */

--- a/src/core/wscript	Mon Aug 25 15:21:01 2008 -0700
+++ b/src/core/wscript	Tue Aug 26 08:41:21 2008 -0700
@@ -45,7 +45,6 @@
         'test.cc',
         'random-variable.cc',
         'rng-stream.cc',
-        'uid-manager.cc',
         'command-line.cc',
         'type-name.cc',
         'type-traits-test.cc',