From 036d2c2548ac1627b91cb685677fd9fcb0f153cd Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 6 Jun 2018 11:27:46 +0200
Subject: [PATCH] parser-inc: properly namespace iostream definitions

---
 dtool/src/parser-inc/iosfwd   |  9 ++--
 dtool/src/parser-inc/iostream | 94 ++++++++++++++++++-----------------
 2 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/dtool/src/parser-inc/iosfwd b/dtool/src/parser-inc/iosfwd
index 176982d433..abf62821ea 100644
--- a/dtool/src/parser-inc/iosfwd
+++ b/dtool/src/parser-inc/iosfwd
@@ -44,9 +44,12 @@ namespace std {
   typedef basic_stringstream<char> stringstream;
 
   typedef basic_filebuf<char> filebuf;
-  typedef basic_ifstream<char> ifstream;
-  typedef basic_ofstream<char> ofstream;
-  typedef basic_fstream<char> fstream;
+  //typedef basic_ifstream<char> ifstream;
+  //typedef basic_ofstream<char> ofstream;
+  //typedef basic_fstream<char> fstream;
+  class ifstream;
+  class ofstream;
+  class fstream;
 
   typedef basic_syncbuf<char> syncbuf;
   typedef basic_osyncstream<char> osyncstream;
diff --git a/dtool/src/parser-inc/iostream b/dtool/src/parser-inc/iostream
index a01e208740..8bfe91d0aa 100644
--- a/dtool/src/parser-inc/iostream
+++ b/dtool/src/parser-inc/iostream
@@ -29,59 +29,61 @@
 // iostream classes, but we do need to know the classnames that are
 // available.
 
-class ostream : virtual public ios {
-__published:
-  ostream(const ostream&) = delete;
+namespace std {
+  class ostream : virtual public ios {
+  __published:
+    ostream(const ostream&) = delete;
 
-  void put(char c);
-  void flush();
-  streampos tellp();
-  void seekp(streampos pos);
-  void seekp(streamoff off, ios_base::seekdir dir);
+    void put(char c);
+    void flush();
+    streampos tellp();
+    void seekp(streampos pos);
+    void seekp(streamoff off, ios_base::seekdir dir);
 
-protected:
-  ostream(ostream &&);
-};
-class istream : virtual public ios {
-__published:
-  istream(const istream&) = delete;
+  protected:
+    ostream(ostream &&);
+  };
+  class istream : virtual public ios {
+  __published:
+    istream(const istream&) = delete;
 
-  int get();
-  streampos tellg();
-  void seekg(streampos pos);
-  void seekg(streamoff off, ios_base::seekdir dir);
+    int get();
+    streampos tellg();
+    void seekg(streampos pos);
+    void seekg(streamoff off, ios_base::seekdir dir);
 
-protected:
-  istream(istream &&);
-};
-class iostream : public istream, public ostream {
-__published:
-  iostream(const iostream&) = delete;
+  protected:
+    istream(istream &&);
+  };
+  class iostream : public istream, public ostream {
+  __published:
+    iostream(const iostream&) = delete;
 
-  void flush();
+    void flush();
 
-protected:
-  iostream(iostream &&);
-};
+  protected:
+    iostream(iostream &&);
+  };
 
-class ofstream : public ostream {
-__published:
-  ofstream();
-  void close();
-};
-class ifstream : public istream {
-__published:
-  ifstream();
-  void close();
-};
-class fstream : public iostream {
-__published:
-  fstream();
-  void close();
-};
+  class ofstream : public ostream {
+  __published:
+    ofstream();
+    void close();
+  };
+  class ifstream : public istream {
+  __published:
+    ifstream();
+    void close();
+  };
+  class fstream : public iostream {
+  __published:
+    fstream();
+    void close();
+  };
 
-extern istream cin;
-extern ostream cout;
-extern ostream cerr;
+  extern istream cin;
+  extern ostream cout;
+  extern ostream cerr;
+}
 
 #endif