pure.cc (writestr): Just use cstdio and std::fputs.

2001-01-26  Benjamin Kosnik  <bkoz@kredhat.com>

	* libsupc++/pure.cc (writestr): Just use cstdio and std::fputs.

From-SVN: r39296

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d9e63a2..8924e93 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-26  Benjamin Kosnik  <bkoz@kredhat.com>
+
+       * libsupc++/pure.cc (writestr): Just use cstdio and std::fputs.
+
 2001-01-25  Loren J. Rittle  <ljrittle@acm.org>
 
         * testsuite/21_strings/inserters_extractors.cc: Remove

diff --git a/libstdc++-v3/libsupc++/pure.cc b/libstdc++-v3/libsupc++/pure.cc
index 7ada066..e4f14d3 100644 (file)
--- a/libstdc++-v3/libsupc++/pure.cc
+++ b/libstdc++-v3/libsupc++/pure.cc
@@ -1,5 +1,5 @@
 // -*- C++ -*- 
-// Copyright (C) 2000 Free Software Foundation
+// Copyright (C) 2000, 2001 Free Software Foundation
 //
 // This file is part of GNU CC.
 //
@@ -28,19 +28,7 @@
 // the GNU General Public License.
 
 #include <bits/c++config.h>
-
-#ifdef _GLIBCPP_HAVE_UNISTD_H
-# include <unistd.h>
-# define writestr(str) write(2, str, sizeof(str) - 1)
-# ifdef __GNU_LIBRARY__
-  /* Avoid forcing the library's meaning of `write' on the user program
-     by using the "internal" name (for use within the library).  */
-/*#  define write(fd, buf, n)  __write((fd), (buf), (n))*/
-# endif
-#else
-# include <stdio.h>
-# define writestr(str) fputs(str, stderr)
-#endif
+#include <cstdio>
 
 extern "C" {
 
@@ -57,8 +45,9 @@ extern void __terminate(void) __attribute__ ((__noreturn__));
 void
 PURE_VIRTUAL_NAME (void)
 {
-  writestr ("pure virtual method called\n");
+  std::fputs ("pure virtual method called\n", stderr);
   __terminate ();
 }
 
 }
+