[v3] minor cleanups

Phil Edwards pedwards@disaster.jaj.com
Wed Sep 5 15:51:00 GMT 2001


These three minor changes don't affect exiting code, but were tested on
x86/linux nonetheless, with no regressions.

With the configury creating a testsuite/Makefile, we no longer need
to check for the existence of a testsuite directory when using mkcheck.
The __sink_unused_warning<> code hasn't been used on the trunk for a long,
long time; Benjamin said it could be removed way back when, but I never got
'round to it.  And with the testsuite_hooks.h.in file being renamed and
moved so that it's no longer generated, we don't need testsuite_flags'
INCLUDES to search the build directory anymore.

All three have been applied to the trunk.  The Makefile.am change has also
been applied to the branch with a suitably modified log entry.  (The other
two changes do not apply to the branch.)  Also, I took the opportunity to
clean up some formatting errors in the trunk&branch ChangeLogs themselves
(mostly leading spaces and other twiddly no-nos).


2001-09-05  Phil Edwards  <pme@sources.redhat.com>

	* testsuite_flags.in:  No longer need to search testsuite builddir.
	* src/stl-inst.cc (__sink_unused_warning):  Unused, remove.
	* Makefile.am:  The testsuite directory never needs to be made here.
	* Makefile.in:  Regenerate.
	* include/Makefile.in:  Regenerate.
	* libio/Makefile.in:  Regenerate.
	* libmath/Makefile.in:  Regenerate.
	* libsupc++/Makefile.in:  Regenerate.
	* po/Makefile.in:  Regenerate.
	* src/Makefile.in:  Regenerate.
	* testsuite/Makefile.in:  Regenerate.


Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/Makefile.am,v
retrieving revision 1.26
diff -u -3 -p -r1.26 Makefile.am
--- Makefile.am	2001/08/14 01:24:25	1.26
+++ Makefile.am	2001/09/05 22:35:12
@@ -35,13 +35,11 @@ mkinstalldirs = $(SHELL) $(toplevel_srcd
 # compile time, execution time, and binary size.
 check-script: $(top_builddir)/mkcheck
 	-(chmod + $(top_builddir)/mkcheck; \
-	  test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \
 	  cd testsuite; \
 	  @glibcpp_builddir@/mkcheck 0)
 
 check-script-install: $(top_builddir)/mkcheck
 	-(chmod + $(top_builddir)/mkcheck; \
-	  test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \
 	  cd testsuite; \
 	  @glibcpp_builddir@/mkcheck 1)
 
Index: testsuite_flags.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite_flags.in,v
retrieving revision 1.9
diff -u -3 -p -r1.9 testsuite_flags.in
--- testsuite_flags.in	2001/08/23 22:35:52	1.9
+++ testsuite_flags.in	2001/09/05 22:35:12
@@ -28,14 +28,14 @@ query=$1
 
 case ${query} in
     --install-includes)
-      INCLUDES="-I${SRC_DIR}/testsuite -I${BUILD_DIR}/testsuite"
+      INCLUDES="-I${SRC_DIR}/testsuite"
       echo ${INCLUDES}
       ;;
     --build-includes)
       INCLUDES="-nostdinc++ @GLIBCPP_INCLUDES@
 	        -I${SRC_DIR}/libsupc++ -I${SRC_DIR}/libio 
 		-I${SRC_DIR}/include/backward 
-		-I${SRC_DIR}/testsuite -I${BUILD_DIR}/testsuite"
+		-I${SRC_DIR}/testsuite"
       echo ${INCLUDES}
       ;;
     --install-cxx)
Index: src/stl-inst.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/stl-inst.cc,v
retrieving revision 1.7
diff -u -3 -p -r1.7 stl-inst.cc
--- stl-inst.cc	2001/04/18 01:06:05	1.7
+++ stl-inst.cc	2001/09/05 22:35:12
@@ -50,27 +50,5 @@ namespace std
     vector<unsigned int>::
     _M_insert_aux(vector<unsigned int>::iterator, unsigned int const &);
 
-#ifdef _GLIBCPP_CONCEPT_CHECKS
-  template
-    void __sink_unused_warning<unsigned int>(unsigned int);
+} // namespace std
 
-  template
-    void __sink_unused_warning<locale::facet*>(locale::facet*);
-
-  template
-    void __sink_unused_warning<char>(char);
-
-  template
-    void __sink_unused_warning<ostreambuf_iterator<char> >
-    (ostreambuf_iterator<char>);
-
-# ifdef _GLIBCPP_USE_WCHAR_T
-  template
-    void __sink_unused_warning<wchar_t>(wchar_t);
-
-  template
-    void __sink_unused_warning<ostreambuf_iterator<wchar_t> > 
-    (ostreambuf_iterator<wchar_t>);
-# endif
-#endif
-} //std



More information about the Libstdc++ mailing list