Makefile.am (install-data-local): Remove pch-install rules.

2007-08-21  Benjamin Kosnik  <bkoz@montsouris.artheist.org>

	* include/Makefile.am (install-data-local): Remove pch-install rules.
	(host_headers): Add stdc++.h, stdtr1c++.h, extc++.h.
	* include/Makefile.in: Regenerate.
	* config.h.in: Same.

	* scripts/check_compile: Remove space between outputs.	
	* include/ext/throw_allocator.h: Correct doxygen markup.	
	* include/bits/char_traits.h: Correct spacing.
	* include/bits/stl_function.h: Same, for 80 column.
	* include/std/valarray: Same.
	* testsuite/util/testsuite_iterators.h: Same.	
	* testsuite/25_algorithms/headers/algorithm/synopsis.cc: Format.

From-SVN: r127685

6 files changed, 40 insertions, 52 deletions

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index f661ed4..b7a2a96 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -754,7 +754,10 @@ host_headers = \
 	${host_srcdir}/os_defines.h \
 	${glibcxx_srcdir}/$(ATOMIC_WORD_SRCDIR)/atomic_word.h \
 	${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \
-	${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h	
+	${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h \
+	${glibcxx_srcdir}/include/precompiled/stdc++.h \
+	${glibcxx_srcdir}/include/precompiled/stdtr1c++.h \
+	${glibcxx_srcdir}/include/precompiled/extc++.h 
 
 # Non-installed host_header files.
 COMPATIBILITY_H = config/abi/compatibility.h
@@ -809,10 +812,8 @@ pch_output_anchors = \
 PCHFLAGS=-Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
 if GLIBCXX_BUILD_PCH
 pch_build = ${pch_output}
-pch_install = install-pch
 else
 pch_build =
-pch_install =
 endif
 
 # List of all timestamp files.  By keeping only one copy of this list, both
@@ -1129,7 +1130,7 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
 # the rest are taken from the original source tree.
 
 if GLIBCXX_HOSTED
-install-data-local: install-headers ${pch_install}
+install-data-local: install-headers 
 else
 install-data-local: install-freestanding-headers
 endif
@@ -1219,16 +1220,6 @@ install-headers:
 	 ${thread_host_headers}; do \
 	  $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
 
-install-pch:
-	$(mkinstalldirs) $(DESTDIR)${pch1_output_installdir}
-	for file in ${pch1_output_builddir}/*; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)${pch1_output_installdir}; done
-	$(mkinstalldirs) $(DESTDIR)${pch2_output_installdir}
-	for file in ${pch2_output_builddir}/*; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)${pch2_output_installdir}; done
-	$(INSTALL_DATA) ${pch1_output_anchor} $(DESTDIR)${host_installdir}
-	$(INSTALL_DATA) ${pch2_output_anchor} $(DESTDIR)${host_installdir}
-
 # By adding these files here, automake will remove them for 'make clean'
 CLEANFILES = ${pch_output} ${pch_output_anchors}
 
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 9f5c7fb..876563f 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -981,7 +981,10 @@ host_headers = \
 	${host_srcdir}/os_defines.h \
 	${glibcxx_srcdir}/$(ATOMIC_WORD_SRCDIR)/atomic_word.h \
 	${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \
-	${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h	
+	${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h \
+	${glibcxx_srcdir}/include/precompiled/stdc++.h \
+	${glibcxx_srcdir}/include/precompiled/stdtr1c++.h \
+	${glibcxx_srcdir}/include/precompiled/extc++.h 
 
 
 # Non-installed host_header files.
@@ -1035,8 +1038,6 @@ pch_output_anchors = \
 PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
 @GLIBCXX_BUILD_PCH_FALSE@pch_build = 
 @GLIBCXX_BUILD_PCH_TRUE@pch_build = ${pch_output}
-@GLIBCXX_BUILD_PCH_FALSE@pch_install = 
-@GLIBCXX_BUILD_PCH_TRUE@pch_install = install-pch
 
 # List of all timestamp files.  By keeping only one copy of this list, both
 # CLEANFILES and all-local are kept up-to-date.
@@ -1512,7 +1513,7 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
 # host_headers_extra are taken out of the build tree staging area;
 # the rest are taken from the original source tree.
 
-@GLIBCXX_HOSTED_TRUE@install-data-local: install-headers ${pch_install}
+@GLIBCXX_HOSTED_TRUE@install-data-local: install-headers 
 @GLIBCXX_HOSTED_FALSE@install-data-local: install-freestanding-headers
 
 # This is a subset of the full install-headers rule.  We only need <cstddef>,
@@ -1600,16 +1601,6 @@ install-headers:
 	 ${thread_host_headers}; do \
 	  $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
 
-install-pch:
-	$(mkinstalldirs) $(DESTDIR)${pch1_output_installdir}
-	for file in ${pch1_output_builddir}/*; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)${pch1_output_installdir}; done
-	$(mkinstalldirs) $(DESTDIR)${pch2_output_installdir}
-	for file in ${pch2_output_builddir}/*; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)${pch2_output_installdir}; done
-	$(INSTALL_DATA) ${pch1_output_anchor} $(DESTDIR)${host_installdir}
-	$(INSTALL_DATA) ${pch2_output_anchor} $(DESTDIR)${host_installdir}
-
 # To remove directories.
 clean-local:
 	rm -rf ${pch_output_dirs}
diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h
index a4b4e3a..250faf5 100644
--- a/libstdc++-v3/include/bits/char_traits.h
+++ b/libstdc++-v3/include/bits/char_traits.h
@@ -60,7 +60,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
    *  types, but who don't need to change the definitions of any function
    *  defined in char_traits, can specialize __gnu_cxx::_Char_types
    *  while leaving __gnu_cxx::char_traits alone. */
-  template <class _CharT>
+  template<typename _CharT>
     struct _Char_types
     {
       typedef unsigned long   int_type;
diff --git a/libstdc++-v3/include/bits/stl_function.h b/libstdc++-v3/include/bits/stl_function.h
index 1bd11a3..7dc5031 100644
--- a/libstdc++-v3/include/bits/stl_function.h
+++ b/libstdc++-v3/include/bits/stl_function.h
@@ -124,9 +124,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
   // 20.3.2 arithmetic
   /** @defgroup s20_3_2_arithmetic Arithmetic Classes
-   *  Because basic math often needs to be done during an algorithm, the library
-   *  provides functors for those operations.  See the documentation for
-   *  @link s20_3_1_base the base classes@endlink for examples of their use.
+
+   *  Because basic math often needs to be done during an algorithm,
+   *  the library provides functors for those operations.  See the
+   *  documentation for @link s20_3_1_base the base classes@endlink
+   *  for examples of their use.
    *
    *  @{
    */
@@ -249,7 +251,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
   // 20.3.4 logical operations
   /** @defgroup s20_3_4_logical Boolean Operations Classes
-   *  Here are wrapper functors for Boolean operations:  @c &&, @c ||, and @c !.
+   *  Here are wrapper functors for Boolean operations: @c &&, @c ||,
+   *  and @c !.
    *
    *  @{
    */
@@ -360,15 +363,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   template <class _Predicate>
     class binary_negate
     : public binary_function<typename _Predicate::first_argument_type,
-			     typename _Predicate::second_argument_type,
-			     bool>
+			     typename _Predicate::second_argument_type, bool>
     {
     protected:
       _Predicate _M_pred;
+
     public:
       explicit
-      binary_negate(const _Predicate& __x)
-      : _M_pred(__x) { }
+      binary_negate(const _Predicate& __x) : _M_pred(__x) { }
 
       bool
       operator()(const typename _Predicate::first_argument_type& __x,
@@ -605,7 +607,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *
    *  @{
    */
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
+  /// One of the @link s20_3_8_memadaptors adaptors for member
+  /// pointers@endlink.
   template <class _Ret, class _Tp>
     class mem_fun_t : public unary_function<_Tp*, _Ret>
     {
@@ -621,7 +624,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       _Ret (_Tp::*_M_f)();
     };
 
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
+  /// One of the @link s20_3_8_memadaptors adaptors for member
+  /// pointers@endlink.
   template <class _Ret, class _Tp>
     class const_mem_fun_t : public unary_function<const _Tp*, _Ret>
     {
@@ -637,7 +641,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       _Ret (_Tp::*_M_f)() const;
     };
 
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
+  /// One of the @link s20_3_8_memadaptors adaptors for member
+  /// pointers@endlink.
   template <class _Ret, class _Tp>
     class mem_fun_ref_t : public unary_function<_Tp, _Ret>
     {
@@ -653,7 +658,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       _Ret (_Tp::*_M_f)();
   };
 
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
+  /// One of the @link s20_3_8_memadaptors adaptors for member
+  /// pointers@endlink.
   template <class _Ret, class _Tp>
     class const_mem_fun_ref_t : public unary_function<_Tp, _Ret>
     {
@@ -669,7 +675,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       _Ret (_Tp::*_M_f)() const;
     };
 
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
+  /// One of the @link s20_3_8_memadaptors adaptors for member
+  /// pointers@endlink.
   template <class _Ret, class _Tp, class _Arg>
     class mem_fun1_t : public binary_function<_Tp*, _Arg, _Ret>
     {
@@ -685,7 +692,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       _Ret (_Tp::*_M_f)(_Arg);
     };
 
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
+  /// One of the @link s20_3_8_memadaptors adaptors for member
+  /// pointers@endlink.
   template <class _Ret, class _Tp, class _Arg>
     class const_mem_fun1_t : public binary_function<const _Tp*, _Arg, _Ret>
     {
@@ -701,7 +709,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       _Ret (_Tp::*_M_f)(_Arg) const;
     };
 
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
+  /// One of the @link s20_3_8_memadaptors adaptors for member
+  /// pointers@endlink.
   template <class _Ret, class _Tp, class _Arg>
     class mem_fun1_ref_t : public binary_function<_Tp, _Arg, _Ret>
     {
@@ -717,7 +726,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       _Ret (_Tp::*_M_f)(_Arg);
     };
 
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
+  /// One of the @link s20_3_8_memadaptors adaptors for member
+  /// pointers@endlink.
   template <class _Ret, class _Tp, class _Arg>
     class const_mem_fun1_ref_t : public binary_function<_Tp, _Arg, _Ret>
     {
diff --git a/libstdc++-v3/include/ext/throw_allocator.h b/libstdc++-v3/include/ext/throw_allocator.h
index 9a3dbef..78b78f1 100644
--- a/libstdc++-v3/include/ext/throw_allocator.h
+++ b/libstdc++-v3/include/ext/throw_allocator.h
@@ -39,7 +39,7 @@
 // purpose. It is provided "as is" without express or implied
 // warranty.
 
-/** @file ext/vstring.h
+/** @file ext/throw_allocator.h
  *  This file is a GNU extension to the Standard C++ Library.
  *
  *  Contains an exception-throwing allocator, useful for testing
@@ -47,10 +47,6 @@
  *  sanity checked.
  */
 
-/**
- * @file throw_allocator.h 
- */
-
 #ifndef _THROW_ALLOCATOR_H
 #define _THROW_ALLOCATOR_H 1
 
diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray
index c8084fd..31799c0 100644
--- a/libstdc++-v3/include/std/valarray
+++ b/libstdc++-v3/include/std/valarray
@@ -881,7 +881,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     valarray<_Tp>::min() const
     {
       _GLIBCXX_DEBUG_ASSERT(_M_size > 0);
-      return *std::min_element(_M_data, _M_data+_M_size);
+      return *std::min_element(_M_data, _M_data + _M_size);
     }
 
   template<typename _Tp>
@@ -889,7 +889,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     valarray<_Tp>::max() const
     {
       _GLIBCXX_DEBUG_ASSERT(_M_size > 0);
-      return *std::max_element(_M_data, _M_data+_M_size);
+      return *std::max_element(_M_data, _M_data + _M_size);
     }
   
   template<class _Tp>