From cb2e4338d269d2fec4e6608d171f569a1cc5cf95 Mon Sep 17 00:00:00 2001
From: bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 27 Jan 2001 19:00:09 +0000
Subject: [PATCH] 2001-01-26 Benjamin Kosnik <bkoz@kredhat.com>
* libsupc++/pure.cc (writestr): Just use cstdio and std::fputs.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39296 138bc75d-0d04-0410-961f-82ee72b054a4
---
libstdc++-v3/ChangeLog | 4 ++++
libstdc++-v3/libsupc++/pure.cc | 19 ++++---------------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d9e63a22db92..8924e938989b 100644
--- 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 7ada0666856a..e4f14d31b944 100644
--- 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 ();
}
}
+
--
GitLab