From: Benjamin Kosnik <bkoz@redhat.com>
Date: Sat, 22 May 2004 21:51:07 +0000 (+0000)
Subject: testsuite_hooks.h (func_callback): Declare copy constructor and assignment operator... 
X-Git-Tag: releases/gcc-4.0.0~8192
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4a1faa55f8f157e36e9b6194055c6dc8fbe2763;p=thirdparty%2Fgcc.git

testsuite_hooks.h (func_callback): Declare copy constructor and assignment operator private.


2004-05-22  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/testsuite_hooks.h (func_callback): Declare copy
	constructor and assignment operator private.
	* testsuite/23_containers/deque/cons/clear_allocator.cc: Match
	exception specifications of base class.
	* testsuite/23_containers/list/cons/clear_allocator.cc: Same.
	* testsuite/23_containers/vector/cons/clear_allocator.cc: Same.
	* testsuite/23_containers/vector/bool/clear_allocator.cc: New.

From-SVN: r82150
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5a360726d96a..2e99412e7d1e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2004-05-22  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/testsuite_hooks.h (func_callback): Declare copy
+	constructor and assignment operator private.	
+	* testsuite/23_containers/deque/cons/clear_allocator.cc: Match
+	exception specifications of base class.
+	* testsuite/23_containers/list/cons/clear_allocator.cc: Same.
+	* testsuite/23_containers/vector/cons/clear_allocator.cc: Same.
+	* testsuite/23_containers/vector/bool/clear_allocator.cc: New.
+		
 2004-05-22  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* libsupc++/cxxabi.h: Remove duplicated and useless public and
diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/clear_allocator.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/clear_allocator.cc
index 8103928a1e3e..f40b2053bce6 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/cons/clear_allocator.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/cons/clear_allocator.cc
@@ -31,20 +31,20 @@ template<typename T>
       struct rebind 
       { typedef clear_alloc<T1> other; };
 
-    virtual void clear()
+    virtual void clear() throw()
     { }
 
-    clear_alloc()
+    clear_alloc() throw()
     { }
     
-    clear_alloc(clear_alloc const& _wa)
+    clear_alloc(clear_alloc const& _wa) throw()
     { }
     
     template<typename T1>
-      clear_alloc(clear_alloc<T1> const& _wa)
+    clear_alloc(clear_alloc<T1> const& _wa) throw()
       { }
 
-    virtual ~clear_alloc()
+    virtual ~clear_alloc() throw()
     { this->clear(); }
 
     T* allocate(typename new_allocator<T>::size_type n, const void *hint = 0)
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/clear_allocator.cc b/libstdc++-v3/testsuite/23_containers/list/cons/clear_allocator.cc
index c74fc085ffba..cdae22b1e304 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/clear_allocator.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/clear_allocator.cc
@@ -31,20 +31,20 @@ template<typename T>
       struct rebind 
       { typedef clear_alloc<T1> other; };
 
-    virtual void clear()
+    virtual void clear() throw()
     { }
 
-    clear_alloc()
+    clear_alloc() throw()
     { }
     
-    clear_alloc(clear_alloc const& _wa)
+    clear_alloc(clear_alloc const& _wa) throw()
     { }
     
     template<typename T1>
-      clear_alloc(clear_alloc<T1> const& _wa)
+      clear_alloc(clear_alloc<T1> const& _wa) throw()
       { }
 
-    virtual ~clear_alloc()
+    virtual ~clear_alloc() throw()
     { this->clear(); }
 
     T* allocate(typename new_allocator<T>::size_type n, const void *hint = 0)
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/clear_allocator.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/clear_allocator.cc
index 5cc878e6c59a..e436f2235f85 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/clear_allocator.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/clear_allocator.cc
@@ -31,20 +31,20 @@ template<typename T>
       struct rebind 
       { typedef clear_alloc<T1> other; };
 
-    virtual void clear()
+    virtual void clear() throw()
     { }
 
-    clear_alloc()
+    clear_alloc() throw()
     { }
     
-    clear_alloc(clear_alloc const& _wa)
+    clear_alloc(clear_alloc const& _wa) throw()
     { }
     
     template<typename T1>
-      clear_alloc(clear_alloc<T1> const& _wa)
+      clear_alloc(clear_alloc<T1> const& _wa) throw()
       { }
 
-    virtual ~clear_alloc()
+    virtual ~clear_alloc() throw()
     { this->clear(); }
 
     T* allocate(typename new_allocator<T>::size_type n, const void *hint = 0)
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.h b/libstdc++-v3/testsuite/testsuite_hooks.h
index daa44232ae4d..1919ab8a1140 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.h
+++ b/libstdc++-v3/testsuite/testsuite_hooks.h
@@ -114,7 +114,12 @@ namespace __gnu_test
   private:
     int		_M_size;
     test_type	_M_tests[15];
-    
+
+    func_callback&
+    operator=(const func_callback&);
+
+    func_callback(const func_callback&);
+
   public:
     func_callback(): _M_size(0) { };