* C++ standard conformance.

2002-09-05  Ben Elliston  <bje@redhat.com>

	* gloss.h: Specify std:: namespace where necessary.
	* gloss.cxx: Likewise.

diff --git a/sid/component/gloss/ChangeLog b/sid/component/gloss/ChangeLog
index 4626f78..a4693f7 100644 (file)
--- a/sid/component/gloss/ChangeLog
+++ b/sid/component/gloss/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-05  Ben Elliston  <bje@redhat.com>
+
+       * gloss.h: Specify std:: namespace where necessary.
+       * gloss.cxx: Likewise.
+
 2002-06-03  Jeff Johnston  <jjohnstn@redhat.com>
 
        * gloss.cxx (gloss32::gloss32): Add "state-snapshot" attribute.

diff --git a/sid/component/gloss/gloss.cxx b/sid/component/gloss/gloss.cxx
index 74a6ebd..b27ad77 100644 (file)
--- a/sid/component/gloss/gloss.cxx
+++ b/sid/component/gloss/gloss.cxx
@@ -176,7 +176,7 @@ gloss32::reset()
 
 // streaming/destreaming of gloss32
 void
-gloss32::stream_state (ostream& o) const
+gloss32::stream_state (std::ostream& o) const
 {
   o << " gloss32";
   /* FIXME: the fds eventually should be saved and restored in some manner. */
@@ -185,7 +185,7 @@ gloss32::stream_state (ostream& o) const
 }
 
 void
-gloss32::destream_state (istream& i)
+gloss32::destream_state (std::istream& i)
 {
   string key;
   int new_max_fds;
@@ -1665,15 +1665,15 @@ gloss32::isatty (int fd, bool& result, int& errcode)
   return true;
 }
 
-ostream& 
-operator << (ostream& out, const gloss32& it)
+std::ostream& 
+operator << (std::ostream& out, const gloss32& it)
 {
   it.stream_state(out);
   return out;
 }
 
-istream& 
-operator >> (istream& in, gloss32& it)
+std::istream& 
+operator >> (std::istream& in, gloss32& it)
 {
   it.destream_state(in);
   return in;

diff --git a/sid/component/gloss/gloss.h b/sid/component/gloss/gloss.h
index 48f947e..4a5d4db 100644 (file)
--- a/sid/component/gloss/gloss.h
+++ b/sid/component/gloss/gloss.h
@@ -93,10 +93,10 @@ protected:
   {
     return parse_attribute(state, *this);
   }
-  void stream_state (ostream& o) const;
-  void destream_state (istream& i);
-  friend ostream& operator << (ostream& o, const gloss32& it);
-  friend istream& operator >> (istream& i, gloss32& it);
+  void stream_state (std::ostream& o) const;
+  void destream_state (std::istream& i);
+  friend std::ostream& operator << (std::ostream& o, const gloss32& it);
+  friend std::istream& operator >> (std::istream& i, gloss32& it);
 
   // Trap invocation and response.
   callback_pin<gloss32> trap_type_ipin;