diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 40ad5f1b2c4c0ef9330bfef916f222edecfbf7e6..399452ba33237cdb3f7b679a3cabecc7cf37cd43 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-25  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/debug/formatter.h (__gnu_debug::_Error_formatter):
+	Remove copy constructor and assignment operator.
+
 2004-06-24  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/concurrence.h (__gnu_cxx::lock): New.
diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h
index 9b5fb1bbab94955f5514fa89c9d74bdbed3f9e8f..db555b0030dba585b947539bec60290ba1b16136 100644
--- a/libstdc++-v3/include/debug/formatter.h
+++ b/libstdc++-v3/include/debug/formatter.h
@@ -358,30 +358,6 @@ namespace __gnu_debug
       _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false)
     { }
 
-    _Error_formatter(const _Error_formatter& __o)
-    : _M_file(__o._M_file), _M_line(__o._M_line), 
-    _M_num_parameters(__o._M_num_parameters), _M_text(__o._M_text),
-    _M_max_length(__o._M_max_length), _M_column(__o._M_column), 
-    _M_first_line(__o._M_first_line), _M_wordwrap(__o._M_wordwrap)
-    { }
-
-    _Error_formatter&
-    operator=(const _Error_formatter& __o)
-    {
-      if (&__o != this)
-	{
-	  _M_file = __o._M_file;
-	  _M_line = __o._M_line;
-	  _M_num_parameters = __o._M_num_parameters;
-	  _M_text = __o._M_text;
-	  _M_max_length = __o._M_max_length;
-	  _M_column = __o._M_column;
-	  _M_first_line = __o._M_first_line;
-	  _M_wordwrap = __o._M_wordwrap;
-	}
-      return *this;
-    }
-
     template<typename _Tp>
       void
       _M_format_word(char*, int, const char*, _Tp) const;