acinclude.m4 (GLIBCPP_CHECK_GNU_MAKE): Remove test != "0".

2000-09-11  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	* acinclude.m4 (GLIBCPP_CHECK_GNU_MAKE): Remove test != "0".
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

	* bits/c++config (__GLIBCPP__): Update, in the hopes of making a
	snapshot release soon.
	(_GNU_SOURCE): Define this in the header files, as ISO C99 support
	is pretty much assumed.

	* testsuite/22_locale/global_templates.cc: New file. Add tests for
	use_facet and has_facet.

	* bits/codecvt.h (codecvt<_InT, _ExT, __enc_traits>::do_out):
	Modify/correct iconv signatures for glibc2.2.

From-SVN: r36344

libstdc++-v3/ChangeLog

+2000-09-11  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
+
+	* acinclude.m4 (GLIBCPP_CHECK_GNU_MAKE): Remove test != "0". 
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+	* bits/c++config (__GLIBCPP__): Update, in the hopes of making a
+	snapshot release soon.
+	(_GNU_SOURCE): Define this in the header files, as ISO C99 support
+	is pretty much assumed.
+
+	* testsuite/22_locale/global_templates.cc: New file. Add tests for
+	use_facet and has_facet.
+
+	* bits/codecvt.h (codecvt<_InT, _ExT, __enc_traits>::do_out):
+	Modify/correct iconv signatures for glibc2.2.
+
 2000-09-10  Branko Cibej  <branko.cibej@hermes.si>
 
 	* acinclude.m4 (GLIBCPP_CHECK_GNU_MAKE): Replace "grep -q" with

libstdc++-v3/acinclude.m4

@@ -1565,7 +1565,7 @@ AC_DEFUN(
           _cv_gnu_make_command='' ;
 dnl Search all the common names for GNU make
           for a in "${MAKE:-make}" make gmake gnumake ; do
-                  if [ "`$a --version 2> /dev/null | grep -c GNU`" != "0" ]
+                  if ( $a --version 2> /dev/null | grep -c GNU )
                   then
                           _cv_gnu_make_command=$a ;
                           break;

libstdc++-v3/aclocal.m4

@@ -1577,7 +1577,7 @@ AC_DEFUN(
           _cv_gnu_make_command='' ;
 dnl Search all the common names for GNU make
           for a in "${MAKE:-make}" make gmake gnumake ; do
-                  if [ "`$a --version 2> /dev/null | grep -c GNU`" != "0" ]
+                  if ( $a --version 2> /dev/null | grep -c GNU )
                   then
                           _cv_gnu_make_command=$a ;
                           break;

libstdc++-v3/bits/c++config

@@ -31,7 +31,11 @@
 #define _CPP_CPPCONFIG 1
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCPP__ 20000324
+#define __GLIBCPP__ 20000911
+
+// By enabling this, __USE_ISOC99 is also enabled, along with other
+// bits like POSIX, SVID, X/Open and GNU extensions.
+#define _GNU_SOURCE 1
 
 // This flag controls the error handling in string, and perhaps other
 // bits as time goes on: check out bits/basic_string.h for more

libstdc++-v3/bits/codecvt.h

@@ -372,7 +372,7 @@ namespace std
 	  
 	  // Argument list for iconv specifies a byte sequence. Thus,
 	  // all to/from arrays must be brutally casted to char*.
-	  const char* __cfrom = reinterpret_cast<const char*>(__from);
+	  char* __cfrom = reinterpret_cast<char*>(const_cast<intern_type*>(__from));
 	  char* __cto = reinterpret_cast<char*>(__to);
 	  size_t __conv = iconv(*__desc, &__cfrom, &__flen, &__cto, &__tlen); 
 	  
@@ -452,7 +452,7 @@ namespace std
 	  
 	  // Argument list for iconv specifies a byte sequence. Thus,
 	  // all to/from arrays must be brutally casted to char*.
-	  const char* __cfrom = reinterpret_cast<const char*>(__from);
+	  char* __cfrom = reinterpret_cast<char*>(const_cast<extern_type*>(__from));
 	  char* __cto = reinterpret_cast<char*>(__to);
 	  size_t __conv = iconv(*__desc, &__cfrom, &__flen, &__cto, &__tlen); 
 	  

libstdc++-v3/testsuite/22_locale/global_templates.cc

+// 2000-09-11 Benjamin Kosnik <bkoz@redhat.com>
+
+// Copyright (C) 2000 Free Software Foundation
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 22.1.2 locale globals [lib.locale.global.templates]
+
+#include <locale>
+#include <debug_assert.h>
+
+typedef std::codecvt<char, char, mbstate_t> ccodecvt;
+
+class gnu_codecvt: public ccodecvt { }; 
+
+void test01()
+{
+  using namespace std;
+
+  bool test = true;
+
+  // construct a locale object with the C facet
+  const locale& 	cloc = locale::classic();
+  // sanity check the constructed locale has the normal facet
+  VERIFY( has_facet<ccodecvt>(cloc) );
+
+  // construct a locale object with the specialized facet.
+  locale                loc(locale::classic(), new gnu_codecvt);
+  // sanity check the constructed locale has the specialized facet.
+  VERIFY( has_facet<gnu_codecvt>(loc) );
+
+  const ccodecvt& cvt01 = use_facet<ccodecvt>(cloc); 
+  const gnu_codecvt& cvt02 = use_facet<gnu_codecvt>(loc); 
+  // VERIFY( cvt01.id != cvt02.id ); // XXX no way to do this, really :(
+}
+
+int main ()
+{
+  test01();
+
+  return 0;
+}