From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18353 invoked by alias); 23 Oct 2004 15:40:10 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 18336 invoked from network); 23 Oct 2004 15:40:09 -0000 Received: from unknown (HELO smtp1.fuse.net) (216.68.8.174) by sourceware.org with SMTP; 23 Oct 2004 15:40:09 -0000 Received: from gx5.fuse.net ([66.42.186.147]) by smtp1.fuse.net (InterMail vM.6.01.03.04 201-2131-111-106-20040729) with ESMTP id <20041023154000.SNPA15104.smtp1.fuse.net@gx5.fuse.net>; Sat, 23 Oct 2004 11:40:00 -0400 Received: from dellpi.pinski.fam ([66.42.186.147]) by gx5.fuse.net (InterMail vG.1.00.00.00 201-2136-104-20040331) with ESMTP id <20041023153951.ZHXV10526.gx5.fuse.net@dellpi.pinski.fam>; Sat, 23 Oct 2004 11:39:51 -0400 Received: from [10.0.0.80] (zhivago.i.pinski.fam [10.0.0.80]) by dellpi.pinski.fam (8.12.2/8.12.1) with ESMTP id i9NFduVT002342; Sat, 23 Oct 2004 11:39:58 -0400 (EDT) Mime-Version: 1.0 (Apple Message framework v618) To: "gcc-patches@gcc.gnu.org Patches" Message-Id: Content-Type: multipart/mixed; boundary=Apple-Mail-11--20288864 Cc: libstdc++@gcc.gnu.org Subject: [PATCH] Fix some of the mt_allocator testcases on darwin From: Andrew Pinski Date: Sat, 23 Oct 2004 16:29:00 -0000 X-SW-Source: 2004-10/txt/msg01985.txt.bz2 --Apple-Mail-11--20288864 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Content-length: 982 The problem is that the testcases use *_t as typedef which is reserved by POSIX and one of them conflicts with Darwin's headers, policy_t. I changed all the *_t to be named *_type which is consistent with other libstdc++ tests and other mt_allocator tests. OK? Thanks, Andrew Pinski ChangeLog: * testsuite/ext/mt_allocator/deallocate_global-2.c: s/value_t/value_type/. s/traits_t/traits_type/. s/policy_t/policy_type/. s/allocator_t/allocator_type/. s/string_t/string_type/. s/list_t/list_type/. * testsuite/ext/mt_allocator/deallocate_global-4.cc: Likewise. * testsuite/ext/mt_allocator/deallocate_global_thread-1.cc: Likewise. * testsuite/ext/mt_allocator/deallocate_global_thread-3.cc: Likewise. * testsuite/ext/mt_allocator/deallocate_local-2.cc: Likewise. * testsuite/ext/mt_allocator/deallocate_local-4.cc: Likewise. * testsuite/ext/mt_allocator/deallocate_local_thread-1.cc: Likewise. * testsuite/ext/mt_allocator/deallocate_local_thread-3.cc: Likewise. --Apple-Mail-11--20288864 Content-Transfer-Encoding: 7bit Content-Type: text/plain; x-unix-mode=0644; name="temp.diff.txt" Content-Disposition: attachment; filename=temp.diff.txt Content-length: 9159 ? temp.diff.txt Index: ext/mt_allocator/deallocate_global-2.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/ext/mt_allocator/deallocate_global-2.cc,v retrieving revision 1.3 diff -u -p -r1.3 deallocate_global-2.cc --- ext/mt_allocator/deallocate_global-2.cc 12 Oct 2004 01:10:39 -0000 1.3 +++ ext/mt_allocator/deallocate_global-2.cc 23 Oct 2004 15:32:39 -0000 @@ -66,14 +66,14 @@ void operator delete(void* p) throw() free(p); } -typedef std::string value_t; -typedef __gnu_cxx::__common_pool_policy policy_t; -typedef __gnu_cxx::__mt_alloc allocator_t; -typedef std::char_traits traits_t; -typedef std::list list_t; +typedef std::string value_type; +typedef __gnu_cxx::__common_pool_policy policy_type; +typedef __gnu_cxx::__mt_alloc allocator_type; +typedef std::char_traits traits_type; +typedef std::list list_type; // Second. -list_t l; +list_type l; int main() { Index: ext/mt_allocator/deallocate_global-4.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/ext/mt_allocator/deallocate_global-4.cc,v retrieving revision 1.3 diff -u -p -r1.3 deallocate_global-4.cc --- ext/mt_allocator/deallocate_global-4.cc 12 Oct 2004 01:10:39 -0000 1.3 +++ ext/mt_allocator/deallocate_global-4.cc 23 Oct 2004 15:32:39 -0000 @@ -67,13 +67,13 @@ void operator delete(void* p) throw() } typedef std::string value_t; -typedef __gnu_cxx::__per_type_pool_policy policy_t; -typedef __gnu_cxx::__mt_alloc allocator_t; -typedef std::char_traits traits_t; -typedef std::list list_t; +typedef __gnu_cxx::__per_type_pool_policy policy_type; +typedef __gnu_cxx::__mt_alloc allocator_type; +typedef std::char_traits traits_type; +typedef std::list list_type; // Second. -list_t l; +list_type l; int main() { Index: ext/mt_allocator/deallocate_global_thread-1.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/ext/mt_allocator/deallocate_global_thread-1.cc,v retrieving revision 1.3 diff -u -p -r1.3 deallocate_global_thread-1.cc --- ext/mt_allocator/deallocate_global_thread-1.cc 12 Oct 2004 01:10:39 -0000 1.3 +++ ext/mt_allocator/deallocate_global_thread-1.cc 23 Oct 2004 15:32:39 -0000 @@ -66,14 +66,14 @@ void operator delete(void* p) throw() free(p); } -typedef std::string value_t; -typedef __gnu_cxx::__common_pool_policy policy_t; -typedef __gnu_cxx::__mt_alloc allocator_t; -typedef std::char_traits traits_t; -typedef std::list list_t; +typedef std::string value_type; +typedef __gnu_cxx::__common_pool_policy policy_type; +typedef __gnu_cxx::__mt_alloc allocator_type; +typedef std::char_traits traits_type; +typedef std::list list_type; // Second. -list_t l; +list_type l; int main() { Index: ext/mt_allocator/deallocate_global_thread-3.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/ext/mt_allocator/deallocate_global_thread-3.cc,v retrieving revision 1.3 diff -u -p -r1.3 deallocate_global_thread-3.cc --- ext/mt_allocator/deallocate_global_thread-3.cc 12 Oct 2004 01:10:39 -0000 1.3 +++ ext/mt_allocator/deallocate_global_thread-3.cc 23 Oct 2004 15:32:39 -0000 @@ -66,14 +66,14 @@ void operator delete(void* p) throw() free(p); } -typedef std::string value_t; -typedef __gnu_cxx::__per_type_pool_policy policy_t; -typedef __gnu_cxx::__mt_alloc allocator_t; -typedef std::char_traits traits_t; -typedef std::list list_t; +typedef std::string value_type; +typedef __gnu_cxx::__per_type_pool_policy policy_type; +typedef __gnu_cxx::__mt_alloc allocator_type; +typedef std::char_traits traits_type; +typedef std::list list_type; // Second. -list_t l; +list_type l; int main() { Index: ext/mt_allocator/deallocate_local-2.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/ext/mt_allocator/deallocate_local-2.cc,v retrieving revision 1.3 diff -u -p -r1.3 deallocate_local-2.cc --- ext/mt_allocator/deallocate_local-2.cc 12 Oct 2004 01:10:39 -0000 1.3 +++ ext/mt_allocator/deallocate_local-2.cc 23 Oct 2004 15:32:39 -0000 @@ -64,17 +64,17 @@ void operator delete(void* p) throw() free(p); } -typedef char value_t; -typedef std::char_traits traits_t; -typedef __gnu_cxx::__common_pool_policy policy_t; -typedef __gnu_cxx::__mt_alloc allocator_t; -typedef std::basic_string string_t; +typedef char value_type; +typedef std::char_traits traits_type; +typedef __gnu_cxx::__common_pool_policy policy_type; +typedef __gnu_cxx::__mt_alloc allocator_type; +typedef std::basic_string string_type; int main() { bool test __attribute__((unused)) = true; { - string_t s; + string_type s; s += "bayou bend"; } return 0; Index: ext/mt_allocator/deallocate_local-4.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/ext/mt_allocator/deallocate_local-4.cc,v retrieving revision 1.3 diff -u -p -r1.3 deallocate_local-4.cc --- ext/mt_allocator/deallocate_local-4.cc 12 Oct 2004 01:10:39 -0000 1.3 +++ ext/mt_allocator/deallocate_local-4.cc 23 Oct 2004 15:32:39 -0000 @@ -64,17 +64,17 @@ void operator delete(void* p) throw() free(p); } -typedef char value_t; -typedef std::char_traits traits_t; -typedef __gnu_cxx::__per_type_pool_policy policy_t; -typedef __gnu_cxx::__mt_alloc allocator_t; -typedef std::basic_string string_t; +typedef char value_type; +typedef std::char_traits traits_type; +typedef __gnu_cxx::__per_type_pool_policy policy_type; +typedef __gnu_cxx::__mt_alloc allocator_type; +typedef std::basic_string string_type; int main() { bool test __attribute__((unused)) = true; { - string_t s; + string_type s; s += "bayou bend"; } return 0; Index: ext/mt_allocator/deallocate_local_thread-1.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/ext/mt_allocator/deallocate_local_thread-1.cc,v retrieving revision 1.3 diff -u -p -r1.3 deallocate_local_thread-1.cc --- ext/mt_allocator/deallocate_local_thread-1.cc 12 Oct 2004 01:10:39 -0000 1.3 +++ ext/mt_allocator/deallocate_local_thread-1.cc 23 Oct 2004 15:32:39 -0000 @@ -64,17 +64,17 @@ void operator delete(void* p) throw() free(p); } -typedef char value_t; -typedef std::char_traits traits_t; -typedef __gnu_cxx::__common_pool_policy policy_t; -typedef __gnu_cxx::__mt_alloc allocator_t; -typedef std::basic_string string_t; +typedef char value_type; +typedef std::char_traits traits_type; +typedef __gnu_cxx::__common_pool_policy policy_type; +typedef __gnu_cxx::__mt_alloc allocator_type; +typedef std::basic_string string_type; int main() { bool test __attribute__((unused)) = true; { - string_t s; + string_type s; s += "bayou bend"; } return 0; Index: ext/mt_allocator/deallocate_local_thread-3.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/ext/mt_allocator/deallocate_local_thread-3.cc,v retrieving revision 1.3 diff -u -p -r1.3 deallocate_local_thread-3.cc --- ext/mt_allocator/deallocate_local_thread-3.cc 12 Oct 2004 01:10:39 -0000 1.3 +++ ext/mt_allocator/deallocate_local_thread-3.cc 23 Oct 2004 15:32:39 -0000 @@ -64,17 +64,17 @@ void operator delete(void* p) throw() free(p); } -typedef char value_t; -typedef std::char_traits traits_t; -typedef __gnu_cxx::__per_type_pool_policy policy_t; -typedef __gnu_cxx::__mt_alloc allocator_t; -typedef std::basic_string string_t; +typedef char value_type; +typedef std::char_traits traits_type; +typedef __gnu_cxx::__per_type_pool_policy policy_type; +typedef __gnu_cxx::__mt_alloc allocator_type; +typedef std::basic_string string_type; int main() { bool test __attribute__((unused)) = true; { - string_t s; + string_type s; s += "bayou bend"; } return 0; --Apple-Mail-11--20288864--