- fixed problem with bdb-compatibility when compiling libstdc++ without

inlining (compatibility functions were missing from libstdc++.r4.so in that
  case).


git-svn-id: file:///srv/svn/repos/haiku/trunk/buildtools@9835 a95241bf-73f2-0310-859d-f6bbb57e9c96

gcc/libio/iostream.cc

@@ -102,6 +102,24 @@ int istream::peek()
   return ch;
 }
 
+// [zooey]: added for R5-compatibility with bdb
+istream& istream::read(char *ptr, int n)
+{
+  return read((char*)ptr, (streamsize)n);
+}
+istream& istream::read(unsigned char *ptr, int n)
+{
+  return read((char*)ptr, (streamsize)n);
+}
+istream& istream::read(signed char *ptr, int n)
+{
+  return read((char*)ptr, (streamsize)n);
+}
+istream& istream::read(void *ptr, int n)
+{
+  return read((char*)ptr, (streamsize)n);
+}
+
 istream& istream::ignore(int n /* = 1 */, int delim /* = EOF */)
 {
     _gcount = 0;
@@ -1022,6 +1040,24 @@ ostream& ostream::write(const char *s, streamsize n)
     return *this;
 }
 
+// [zooey]: added for R5-compatibility
+ostream& ostream::write(const char *s, int n)
+{
+  return write((const char*)s, (streamsize)n);
+}
+ostream& ostream::write(const unsigned char *s, int n)
+{
+  return write((const char*)s, (streamsize)n);
+}
+ostream& ostream::write(const signed char *s, int n)
+{
+  return write((const char*)s, (streamsize)n);
+}
+ostream& ostream::write(const void *s, int n)
+{ 
+  return write((const char*)s, (streamsize)n);
+}
+
 void ostream::do_osfx()
 {
     if (flags() & ios::unitbuf)

gcc/libio/iostream.h

@@ -69,15 +69,12 @@ class ostream : virtual public ios
     ostream& write(const void *s, streamsize n)
       { return write((const char*)s, n);}
 #ifdef _STREAM_COMPAT
-    // [zooey]: added for R5-compatibility
-    ostream& write(const char *s, int n)
-      { return write((const char*)s, (streamsize)n);}
-    ostream& write(const unsigned char *s, int n)
-      { return write((const char*)s, (streamsize)n);}
-    ostream& write(const signed char *s, int n)
-      { return write((const char*)s, (streamsize)n);}
-    ostream& write(const void *s, int n)
-      { return write((const char*)s, (streamsize)n);}
+    // [zooey]: added for R5-compatibility with bdb,
+    // these can't be inlined as they wouldn't end up in the lib then.
+    ostream& write(const char *s, int n);
+    ostream& write(const unsigned char *s, int n);
+    ostream& write(const signed char *s, int n);
+    ostream& write(const void *s, int n);
 #endif
     ostream& seekp(streampos);
     ostream& seekp(streamoff, _seek_dir);
@@ -153,15 +150,12 @@ protected:
     istream& read(void *ptr, streamsize n)
       { return read((char*)ptr, n); }
 #ifdef _STREAM_COMPAT
-    // [zooey]: added for R5-compatibility
-    istream& read(char *ptr, int n)
-      { return read((char*)ptr, (streamsize)n); }
-    istream& read(unsigned char *ptr, int n)
-      { return read((char*)ptr, (streamsize)n); }
-    istream& read(signed char *ptr, int n)
-      { return read((char*)ptr, (streamsize)n); }
-    istream& read(void *ptr, int n)
-      { return read((char*)ptr, (streamsize)n); }
+    // [zooey]: added for R5-compatibility with bdb,
+    // these can't be inlined as they wouldn't end up in the lib then.
+    istream& read(char *ptr, int n);
+    istream& read(unsigned char *ptr, int n);
+    istream& read(signed char *ptr, int n);
+    istream& read(void *ptr, int n);
 #endif
     istream& get(streambuf& sb, char delim = '\n');
     istream& gets(char **s, char delim = '\n');

gcc_distribution/html-docs/create-docs.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
-BINUTILS=binutils-2.15-beos
-GCC=gcc-2.95.3-beos
+BINUTILS=binutils
+GCC=gcc
 
 echo generation html-docs for as...
 ln -sf ../../$BINUTILS/gas/doc/all.texi asconfig.texi
@@ -49,7 +49,7 @@ texi2html -split=section -nonumber -top_file=index.html -toc_file=toc.html -subd
 ln -sf iostream/index.html iostream.html
 
 echo generation html-docs for ld...
-texi2html -split=section -top_file=index.html -toc_file=toc.html -subdir=ld -I ../../binutils-2.15-beos/bfd/doc ../../$BINUTILS/ld/ld.texinfo
+texi2html -split=section -top_file=index.html -toc_file=toc.html -subdir=ld -I ../../$BINUTILS/bfd/doc ../../$BINUTILS/ld/ld.texinfo
 ln -sf ld/index.html ld.html
 
 echo generation html-docs for ldint...