From: Benjamin Kosnik Date: Tue, 22 Nov 2005 00:19:07 +0000 (+0000) Subject: del_op.cc: Include c++config.h first. X-Git-Tag: releases/gcc-4.2.0~5822 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b967bf2560748664c1afbdb7d4576a522b00175d;p=thirdparty%2Fgcc.git del_op.cc: Include c++config.h first. 2005-11-21 Benjamin Kosnik * libsupc++/del_op.cc: Include c++config.h first. * libsupc++/eh_alloc.cc: Same. * libsupc++/new_opv.cc: Same. * libsupc++/eh_throw.cc: Same. * libsupc++/new_op.cc: Same. * libsupc++/del_opv.cc: Same. * libsupc++/eh_catch.cc: Same. * libsupc++/guard.cc: Same. * libsupc++/del_opnt.cc: Same. * libsupc++/eh_exception.cc: Same. * libsupc++/new_opvnt.cc: Same. * libsupc++/eh_term_handler.cc: Same. * libsupc++/eh_personality.cc: Same. * libsupc++/eh_call.cc: Same. * libsupc++/new_opnt.cc: Same. * libsupc++/del_opvnt.cc: Same. 2005-11-21 Benjamin Kosnik * src/Makefile.am (LTCXXCOMPILE): CXXFLAGS last. * libsupc++/Makefile.am: Same. * src/Makefile.in: Regenerate. * libsupc++/Makefile.in: Same. From-SVN: r107343 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 07224593ffd3..c45b76cb102c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,29 @@ +2005-11-21 Benjamin Kosnik + + * libsupc++/del_op.cc: Include c++config.h first. + * libsupc++/eh_alloc.cc: Same. + * libsupc++/new_opv.cc: Same. + * libsupc++/eh_throw.cc: Same. + * libsupc++/new_op.cc: Same. + * libsupc++/del_opv.cc: Same. + * libsupc++/eh_catch.cc: Same. + * libsupc++/guard.cc: Same. + * libsupc++/del_opnt.cc: Same. + * libsupc++/eh_exception.cc: Same. + * libsupc++/new_opvnt.cc: Same. + * libsupc++/eh_term_handler.cc: Same. + * libsupc++/eh_personality.cc: Same. + * libsupc++/eh_call.cc: Same. + * libsupc++/new_opnt.cc: Same. + * libsupc++/del_opvnt.cc: Same. + +2005-11-21 Benjamin Kosnik + + * src/Makefile.am (LTCXXCOMPILE): CXXFLAGS last. + * libsupc++/Makefile.am: Same. + * src/Makefile.in: Regenerate. + * libsupc++/Makefile.in: Same. + 2005-11-21 Paolo Carlini * include/ext/sso_string_base.h: Minor formatting and stylistic fixes. @@ -20,9 +46,9 @@ Just use a static member. (__rc_string_base<>::__rc_string_base(), _S_construct): Adjust. - * include/ext/rc_string_base.h (__rc_string_base<>::_Rep): Use anonymous - union together with _CharT to fix alignment issues, rebind to _Rep and - rename _Raw_alloc to _Rep_alloc_type. + * include/ext/rc_string_base.h (__rc_string_base<>::_Rep): Use + anonymous union together with _CharT to fix alignment issues, + rebind to _Rep and rename _Raw_alloc to _Rep_alloc_type. (__rc_string_base<>::_Rep::_S_create, _M_destroy): Adjust consistently. * include/ext/vstring_util.h (__is_null_p): Move inside struct @@ -44,8 +70,7 @@ (__rc_string_base<>::_M_is_leaked, _M_set_sharable): Change to private. * include/ext/sso_string_base.h (__sso_string_base<>::_M_swap): Likewise. - (__sso_string_base<>::_M_is_leaked, _M_set_sharable): Remove, unused. - + (__sso_string_base<>::_M_is_leaked, _M_set_sharable): Remove, unused. * include/ext/rc_string_base.h (__rc_string_base<>::_M_data(_CharT*): Return void. * include/ext/sso_string_base.h (__sso_string_base<>::_M_data(_CharT*): diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 161a4a02d835..2c749cb0dbe9 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -1,6 +1,7 @@ ## Makefile for the GNU C++ Support library. ## -## Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 +## Free Software Foundation, Inc. ## ## Process this file with automake to produce Makefile.in. ## @@ -136,7 +137,7 @@ cp-demangle.o: cp-demangle.c # CXX undo the affect of disable-shared. LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) # 3) We'd have a problem when building the shared libstdc++ object if # the rules automake generates would be used. We cannot allow g++ to diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 44d57cc2e4c8..016bdb3dba9d 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -395,7 +395,7 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \ # CXX undo the affect of disable-shared. LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) # 3) We'd have a problem when building the shared libstdc++ object if diff --git a/libstdc++-v3/libsupc++/del_op.cc b/libstdc++-v3/libsupc++/del_op.cc index 194a87aa65ea..93f4aa8373cb 100644 --- a/libstdc++-v3/libsupc++/del_op.cc +++ b/libstdc++-v3/libsupc++/del_op.cc @@ -28,8 +28,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include "new" #include +#include "new" #if _GLIBCXX_HOSTED #include #endif diff --git a/libstdc++-v3/libsupc++/del_opnt.cc b/libstdc++-v3/libsupc++/del_opnt.cc index b03a0798133a..1aa25d76ba5b 100644 --- a/libstdc++-v3/libsupc++/del_opnt.cc +++ b/libstdc++-v3/libsupc++/del_opnt.cc @@ -28,8 +28,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include "new" #include +#include "new" extern "C" void free (void *); diff --git a/libstdc++-v3/libsupc++/del_opv.cc b/libstdc++-v3/libsupc++/del_opv.cc index 98aaa9b2736a..9a08afbb54be 100644 --- a/libstdc++-v3/libsupc++/del_opv.cc +++ b/libstdc++-v3/libsupc++/del_opv.cc @@ -28,8 +28,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include "new" #include +#include "new" _GLIBCXX_WEAK_DEFINITION void operator delete[] (void *ptr) throw () diff --git a/libstdc++-v3/libsupc++/del_opvnt.cc b/libstdc++-v3/libsupc++/del_opvnt.cc index b9c81ce74e0f..4dbe48931cfc 100644 --- a/libstdc++-v3/libsupc++/del_opvnt.cc +++ b/libstdc++-v3/libsupc++/del_opvnt.cc @@ -28,8 +28,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include "new" #include +#include "new" _GLIBCXX_WEAK_DEFINITION void operator delete[] (void *ptr, const std::nothrow_t&) throw () diff --git a/libstdc++-v3/libsupc++/eh_alloc.cc b/libstdc++-v3/libsupc++/eh_alloc.cc index 3577920e0f3b..5a0d50c80587 100644 --- a/libstdc++-v3/libsupc++/eh_alloc.cc +++ b/libstdc++-v3/libsupc++/eh_alloc.cc @@ -1,5 +1,5 @@ // -*- C++ -*- Allocate exception objects. -// Copyright (C) 2001, 2004 Free Software Foundation, Inc. +// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. // // This file is part of GCC. // @@ -30,6 +30,7 @@ // This is derived from the C++ ABI for IA-64. Where we diverge // for cross-architecture compatibility are noted with "@@@". +#include #include #if _GLIBCXX_HOSTED #include @@ -37,7 +38,6 @@ #include #include #include "unwind-cxx.h" -#include "bits/c++config.h" #include "bits/gthr.h" #if _GLIBCXX_HOSTED diff --git a/libstdc++-v3/libsupc++/eh_call.cc b/libstdc++-v3/libsupc++/eh_call.cc index 4db8023fcdb7..edf62188a6b6 100644 --- a/libstdc++-v3/libsupc++/eh_call.cc +++ b/libstdc++-v3/libsupc++/eh_call.cc @@ -27,7 +27,6 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. - #include #include #include diff --git a/libstdc++-v3/libsupc++/eh_catch.cc b/libstdc++-v3/libsupc++/eh_catch.cc index d84584029bec..77b8a82dd167 100644 --- a/libstdc++-v3/libsupc++/eh_catch.cc +++ b/libstdc++-v3/libsupc++/eh_catch.cc @@ -27,7 +27,6 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. - #include #include "unwind-cxx.h" diff --git a/libstdc++-v3/libsupc++/eh_exception.cc b/libstdc++-v3/libsupc++/eh_exception.cc index fc78d9be9c2c..81d7e70bcf3e 100644 --- a/libstdc++-v3/libsupc++/eh_exception.cc +++ b/libstdc++-v3/libsupc++/eh_exception.cc @@ -28,7 +28,6 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. - #include "typeinfo" #include "exception" #include "unwind-cxx.h" diff --git a/libstdc++-v3/libsupc++/eh_personality.cc b/libstdc++-v3/libsupc++/eh_personality.cc index f07864f1d6fa..917a397569cd 100644 --- a/libstdc++-v3/libsupc++/eh_personality.cc +++ b/libstdc++-v3/libsupc++/eh_personality.cc @@ -27,7 +27,6 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. - #include #include #include diff --git a/libstdc++-v3/libsupc++/eh_term_handler.cc b/libstdc++-v3/libsupc++/eh_term_handler.cc index 66025ed6a788..b3914974931d 100644 --- a/libstdc++-v3/libsupc++/eh_term_handler.cc +++ b/libstdc++-v3/libsupc++/eh_term_handler.cc @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include "unwind-cxx.h" #include +#include "unwind-cxx.h" /* We default to the talkative, informative handler in a normal hosted library. This pulls in the demangler, the dyn-string utilities, and diff --git a/libstdc++-v3/libsupc++/eh_throw.cc b/libstdc++-v3/libsupc++/eh_throw.cc index 9f26be008abf..b405f8f7c641 100644 --- a/libstdc++-v3/libsupc++/eh_throw.cc +++ b/libstdc++-v3/libsupc++/eh_throw.cc @@ -27,7 +27,6 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. - #include #include "unwind-cxx.h" diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc index e75dc42a428c..e7fe2b6e7b9b 100644 --- a/libstdc++-v3/libsupc++/guard.cc +++ b/libstdc++-v3/libsupc++/guard.cc @@ -29,9 +29,9 @@ // Written by Mark Mitchell, CodeSourcery LLC, // Thread support written by Jason Merrill, Red Hat Inc. +#include #include #include -#include #include #include diff --git a/libstdc++-v3/libsupc++/new_op.cc b/libstdc++-v3/libsupc++/new_op.cc index 76ede3097eab..8059d1d110cc 100644 --- a/libstdc++-v3/libsupc++/new_op.cc +++ b/libstdc++-v3/libsupc++/new_op.cc @@ -29,10 +29,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include "new" +#include #include #include -#include +#include "new" using std::new_handler; using std::bad_alloc; diff --git a/libstdc++-v3/libsupc++/new_opnt.cc b/libstdc++-v3/libsupc++/new_opnt.cc index 4a44bc79d49e..65b79a355f05 100644 --- a/libstdc++-v3/libsupc++/new_opnt.cc +++ b/libstdc++-v3/libsupc++/new_opnt.cc @@ -27,9 +27,9 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include "new" -#include #include +#include +#include "new" using std::new_handler; using std::bad_alloc; diff --git a/libstdc++-v3/libsupc++/new_opv.cc b/libstdc++-v3/libsupc++/new_opv.cc index 5f7613532809..e40565bada71 100644 --- a/libstdc++-v3/libsupc++/new_opv.cc +++ b/libstdc++-v3/libsupc++/new_opv.cc @@ -28,8 +28,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include "new" #include +#include "new" _GLIBCXX_WEAK_DEFINITION void* operator new[] (std::size_t sz) throw (std::bad_alloc) diff --git a/libstdc++-v3/libsupc++/new_opvnt.cc b/libstdc++-v3/libsupc++/new_opvnt.cc index f681e33e8062..7d59d43c33fb 100644 --- a/libstdc++-v3/libsupc++/new_opvnt.cc +++ b/libstdc++-v3/libsupc++/new_opvnt.cc @@ -28,8 +28,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include "new" #include +#include "new" _GLIBCXX_WEAK_DEFINITION void* operator new[] (std::size_t sz, const std::nothrow_t& nothrow) throw() diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 903930a81809..113f2dc0d318 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the src subdirectory of the GNU C++ Standard library. ## -## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005 ## Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. @@ -221,7 +221,7 @@ AM_CXXFLAGS = \ # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to # attempt to infer which configuration to use LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) # 3) We'd have a problem when building the shared libstdc++ object if # the rules automake generates would be used. We cannot allow g++ to diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 188f46ce07d0..d205c01eac86 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -395,7 +395,7 @@ AM_CXXFLAGS = \ # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to # attempt to infer which configuration to use LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) # 3) We'd have a problem when building the shared libstdc++ object if