--- a/src/dynamic-ld.cc	Thu Dec 05 04:43:20 2002 +0000
+++ b/src/dynamic-ld.cc	Fri Dec 06 21:29:19 2002 +0000
@@ -24,11 +24,11 @@
 #include <config.h>
 #endif
 
+#include <list>
+
 #include "oct-time.h"
 #include "file-stat.h"
 
-#include "DLList.h"
-
 #include <defaults.h>
 
 #include "defun.h"
@@ -42,9 +42,6 @@
 // functions to be cleared.
 static bool Vwarn_reload_forces_clear;
 
-template class DLNode<octave_shlib>;
-template class DLList<octave_shlib>;
-
 class
 octave_shlib_list
 {
@@ -75,7 +72,7 @@
   static bool instance_ok (void);
 
   // List of libraries we have loaded.
-  DLList<octave_shlib> lib_list;
+  std::list<octave_shlib> lib_list;
 
   // No copying!
 
@@ -89,19 +86,22 @@
 void
 octave_shlib_list::do_append (const octave_shlib& shl)
 {
-  lib_list.append (shl);
+  lib_list.push_back (shl);
 }
 
 void
 octave_shlib_list::do_remove (octave_shlib& shl)
 {
-  for (Pix p = lib_list.first (); p != 0; lib_list.next (p))
+  
+  for (std::list<octave_shlib>::iterator p = lib_list.begin ();
+       p != lib_list.end ();
+       p++)
     {
-      if (lib_list(p) == shl)
+      if (*p == shl)
 	{
 	  shl.close ();
 
-	  lib_list.del (p);
+	  lib_list.erase (p);
 
 	  break;
 	}
@@ -116,13 +116,15 @@
 
   shl = octave_shlib ();
 
-  for (Pix p = lib_list.first (); p != 0; lib_list.next (p))
+  for (std::list<octave_shlib>::iterator p = lib_list.begin ();
+       p != lib_list.end ();
+       p++)
     {
-      function = lib_list(p).search (fcn_name, mangler);
+      function = p->search (fcn_name, mangler);
 
       if (function)
 	{
-	  shl = lib_list(p);
+	  shl = *p;
 
 	  break;
 	}