--- a/liboctave/util/base-list.h	Wed Aug 17 10:30:50 2016 -0700
+++ b/liboctave/util/base-list.h	Wed Aug 17 17:57:49 2016 -0400
@@ -29,103 +29,106 @@
 
 #include <list>
 
-template <typename elt_type>
-class
-octave_base_list
+namespace octave
 {
-public:
-
-  typedef typename std::list<elt_type>::iterator iterator;
-  typedef typename std::list<elt_type>::const_iterator const_iterator;
-
-  typedef typename std::list<elt_type>::reverse_iterator reverse_iterator;
-  typedef typename std::list<elt_type>::const_reverse_iterator const_reverse_iterator;
+  template <typename elt_type>
+  class
+  base_list
+  {
+  public:
 
-  bool empty (void) const { return lst.empty (); }
+    typedef typename std::list<elt_type>::iterator iterator;
+    typedef typename std::list<elt_type>::const_iterator const_iterator;
 
-  size_t size (void) const { return lst.size (); }
-  size_t length (void) const { return size (); }
+    typedef typename std::list<elt_type>::reverse_iterator reverse_iterator;
+    typedef typename std::list<elt_type>::const_reverse_iterator const_reverse_iterator;
 
-  iterator erase (iterator pos) { return lst.erase (pos); }
+    bool empty (void) const { return lst.empty (); }
 
-  template <typename P>
-  void remove_if (P pred)
-  {
-    lst.remove_if (pred);
+    size_t size (void) const { return lst.size (); }
+    size_t length (void) const { return size (); }
+
+    iterator erase (iterator pos) { return lst.erase (pos); }
 
-    // FIXME: kluge removed 8/7/13.  Eventually this commented
-    //        code should be deleted.
-    //
-    // FIXME: this kluge should be removed at some point.
-    // We would like to simply call
-    //
-    //   lst.remove_if (pred);
-    //
-    // but the Sun Studio compiler chokes on that.
-    //
-    // iterator b = lst.begin ();
-    // iterator e = lst.end ();
-    // while (b != e)
-    //   {
-    //     iterator n = b;
-    //     n++;
-    //     if (pred (*b))
-    //       lst.erase (b);
-    //     b = n;
-    //   }
-  }
+    template <typename P>
+    void remove_if (P pred)
+    {
+      lst.remove_if (pred);
 
-  void clear (void) { lst.clear (); }
+      // FIXME: kluge removed 8/7/13.  Eventually this commented
+      //        code should be deleted.
+      //
+      // FIXME: this kluge should be removed at some point.
+      // We would like to simply call
+      //
+      //   lst.remove_if (pred);
+      //
+      // but the Sun Studio compiler chokes on that.
+      //
+      // iterator b = lst.begin ();
+      // iterator e = lst.end ();
+      // while (b != e)
+      //   {
+      //     iterator n = b;
+      //     n++;
+      //     if (pred (*b))
+      //       lst.erase (b);
+      //     b = n;
+      //   }
+    }
+
+    void clear (void) { lst.clear (); }
 
-  iterator begin (void) { return iterator (lst.begin ()); }
-  const_iterator begin (void) const { return const_iterator (lst.begin ()); }
+    iterator begin (void) { return iterator (lst.begin ()); }
+    const_iterator begin (void) const { return const_iterator (lst.begin ()); }
 
-  iterator end (void) { return iterator (lst.end ()); }
-  const_iterator end (void) const { return const_iterator (lst.end ()); }
+    iterator end (void) { return iterator (lst.end ()); }
+    const_iterator end (void) const { return const_iterator (lst.end ()); }
 
-  reverse_iterator rbegin (void) { return reverse_iterator (lst.rbegin ()); }
-  const_reverse_iterator rbegin (void) const
-  { return const_reverse_iterator (lst.rbegin ()); }
+    reverse_iterator rbegin (void) { return reverse_iterator (lst.rbegin ()); }
+    const_reverse_iterator rbegin (void) const
+    { return const_reverse_iterator (lst.rbegin ()); }
 
-  reverse_iterator rend (void) { return reverse_iterator (lst.rend ()); }
-  const_reverse_iterator rend (void) const
-  { return const_reverse_iterator (lst.rend ()); }
+    reverse_iterator rend (void) { return reverse_iterator (lst.rend ()); }
+    const_reverse_iterator rend (void) const
+    { return const_reverse_iterator (lst.rend ()); }
+
+    elt_type& front (void) { return lst.front (); }
+    elt_type& back (void) { return lst.back (); }
 
-  elt_type& front (void) { return lst.front (); }
-  elt_type& back (void) { return lst.back (); }
+    const elt_type& front (void) const { return lst.front (); }
+    const elt_type& back (void) const { return lst.back (); }
 
-  const elt_type& front (void) const { return lst.front (); }
-  const elt_type& back (void) const { return lst.back (); }
+    void push_front (const elt_type& s) { lst.push_front (s); }
+    void push_back (const elt_type& s) { lst.push_back (s); }
 
-  void push_front (const elt_type& s) { lst.push_front (s); }
-  void push_back (const elt_type& s) { lst.push_back (s); }
+    void pop_front (void) { lst.pop_front (); }
+    void pop_back (void) { lst.pop_back (); }
 
-  void pop_front (void) { lst.pop_front (); }
-  void pop_back (void) { lst.pop_back (); }
-
-  // For backward compatibility.
-  void append (const elt_type& s) { lst.push_back (s); }
+    // For backward compatibility.
+    void append (const elt_type& s) { lst.push_back (s); }
 
-  octave_base_list (void) : lst () { }
+    base_list (void) : lst () { }
 
-  octave_base_list (const std::list<elt_type>& l) : lst (l) { }
+    base_list (const std::list<elt_type>& l) : lst (l) { }
 
-  octave_base_list (const octave_base_list& bl) : lst (bl.lst) { }
+    base_list (const base_list& bl) : lst (bl.lst) { }
 
-  octave_base_list& operator = (const octave_base_list& bl)
-  {
-    if (this != &bl)
-      {
-        lst = bl.lst;
-      }
-    return *this;
-  }
+    base_list& operator = (const base_list& bl)
+    {
+      if (this != &bl)
+        {
+          lst = bl.lst;
+        }
+      return *this;
+    }
 
-  virtual ~octave_base_list (void) { }
+    virtual ~base_list (void) { }
+
+  private:
 
-private:
-
-  std::list<elt_type> lst;
-};
+    std::list<elt_type> lst;
+  };
+}
 
 #endif