From 0eda1ad2c6db874a6fed9c45851d4222250a2255 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 7 Aug 2008 02:53:10 -0400
Subject: The Python interface layer is building again.

---
 python/pyfstream.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'python/pyfstream.h')

diff --git a/python/pyfstream.h b/python/pyfstream.h
index 1d72d471..aaa5cbeb 100644
--- a/python/pyfstream.h
+++ b/python/pyfstream.h
@@ -37,7 +37,7 @@
 
 class pyoutbuf : public boost::noncopyable, public std::streambuf
 {
-  pyoutbf();
+  pyoutbuf();
 
 protected:
   PyFileObject * fo;    // Python file object
@@ -47,7 +47,7 @@ public:
   pyoutbuf(PyFileObject * _fo) : fo(_fo) {
     TRACE_CTOR(pyoutbuf, "PyFileObject *");
   }
-  ~pyoutbuf() : throw() {
+  ~pyoutbuf() throw() {
     TRACE_DTOR(pyoutbuf);
   }
 
@@ -58,7 +58,7 @@ protected:
       char z[2];
       z[0] = c;
       z[1] = '\0';
-      if (PyFile_WriteString(z, (PyObject *)fo) < 0) {
+      if (PyFile_WriteString(z, reinterpret_cast<PyObject *>(fo)) < 0) {
 	return EOF;
       }
     }
@@ -70,14 +70,14 @@ protected:
     char * buf = new char[num + 1];
     std::strncpy(buf, s, num);
     buf[num] = '\0';
-    if (PyFile_WriteString(buf, (PyObject *)fo) < 0)
+    if (PyFile_WriteString(buf, reinterpret_cast<PyObject *>(fo)) < 0)
       num = 0;
-    checked_array_delete(buf);
+    boost::checked_array_delete(buf);
     return num;
   }
 };
 
-class pyofstream : public noncopyable, public std::ostream
+class pyofstream : public boost::noncopyable, public std::ostream
 {
   pyofstream();
 
@@ -97,7 +97,7 @@ public:
 // pyifstream
 // - a stream that reads on a file descriptor
 
-class pyinbuf : public noncopyable, public std::streambuf
+class pyinbuf : public boost::noncopyable, public std::streambuf
 {
   pyinbuf();
 
@@ -161,7 +161,7 @@ protected:
 
     // read at most bufSize new characters
     int num;
-    PyObject *line = PyFile_GetLine((PyObject *)fo, bufSize);
+    PyObject *line = PyFile_GetLine(reinterpret_cast<PyObject *>(fo), bufSize);
     if (! line || ! PyString_Check(line)) {
       // ERROR or EOF
       return EOF;
@@ -183,7 +183,7 @@ protected:
   }
 };
 
-class pyifstream : public noncopyable, public std::istream
+class pyifstream : public boost::noncopyable, public std::istream
 {
   pyifstream();
 
-- 
cgit v1.2.3