From f46858c49bd78f4ce4365b98c8e1ef76c58efafc Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 8 Apr 2005 14:10:22 +0000
Subject: [PATCH] Moved UByte4 i/ostream support into io_utils.

---
 include/osg/UByte4   | 13 -------------
 include/osg/io_utils | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/include/osg/UByte4 b/include/osg/UByte4
index 90256209b..7998a30ce 100644
--- a/include/osg/UByte4
+++ b/include/osg/UByte4
@@ -16,8 +16,6 @@
 
 #include <osg/Vec3>
 
-#include <ostream>
-
 namespace osg {
 
 /** General purpose float quad.
@@ -147,19 +145,8 @@ class UByte4
             return *this;
         }
 
-        friend inline std::ostream& operator << (std::ostream& output, const UByte4& vec)
-        {
-	    output << (int)vec._v[0] << " "
-                   << (int)vec._v[1] << " "
-                   << (int)vec._v[2] << " "
-                   << (int)vec._v[3];
-	    return output; 	// to enable cascading
-	}
-
 };	// end of class UByte4
 
-
-
 }	// end of namespace osg
 
 #endif
diff --git a/include/osg/io_utils b/include/osg/io_utils
index bbb9f0df9..98cc01733 100644
--- a/include/osg/io_utils
+++ b/include/osg/io_utils
@@ -17,12 +17,8 @@
 #include <ostream>
 #include <istream>
 
-#include <osg/Vec2f>
-#include <osg/Vec2d>
-#include <osg/Vec3f>
-#include <osg/Vec3d>
-#include <osg/Vec4f>
 #include <osg/Vec4d>
+#include <osg/UByte4>
 #include <osg/Matrixf>
 #include <osg/Matrixd>
 
@@ -158,6 +154,17 @@ inline std::ostream& operator<< (std::ostream& os, const Matrixd& m )
     return os;
 }
 
+//////////////////////////////////////////////////////////////////////////
+// UByte4 steaming operators.
+inline std::ostream& operator << (std::ostream& output, const UByte4& vec)
+{
+    output << (int)vec._v[0] << " "
+           << (int)vec._v[1] << " "
+           << (int)vec._v[2] << " "
+           << (int)vec._v[3];
+    return output; 	// to enable cascading
+}
+
 
 }    // end of namespace osg
 #endif