From ccefa05523cb778125ff97e0ea0e70c0f4d7ffd7 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 7 Mar 2004 14:21:11 +0000
Subject: [PATCH] Clean up of headers.

---
 include/osg/Notify                     | 30 --------------------------
 include/osg/UnitTestFramework          |  1 -
 src/osg/Notify.cpp                     |  1 +
 src/osgGA/AnimationPathManipulator.cpp |  3 ++-
 src/osgProducer/ViewerEventHandler.cpp |  1 +
 5 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/include/osg/Notify b/include/osg/Notify
index d86475288..ccd439f5e 100644
--- a/include/osg/Notify
+++ b/include/osg/Notify
@@ -17,8 +17,6 @@
 #include <osg/Export>
 
 #include <ostream>
-#include <fstream>
-#include <memory>
 
 namespace osg {
 
@@ -38,15 +36,6 @@ enum NotifySeverity {
     DEBUG_FP=6
 };
 
-/** global notify level. */
-//extern SG_EXPORT NotifySeverity g_NotifyLevel;
-
-/** global notify nul stream. added for Mac OSX */
-//extern SG_EXPORT std::auto_ptr<std::ofstream> g_NotifyNulStream;
-
-/** global notify nul stream. added for Mac OSX */
-//extern SG_EXPORT bool g_NotifyInit;
-
 /** set the notify level, overriding the default or value set by
   * the environmental variable OSGNOTIFYLEVEL.
   */
@@ -73,26 +62,7 @@ extern SG_EXPORT bool initNotifyLevel();
   * stream (like cout) i.e osg::notify(osg::DEBUG) << "Hello Bugs!"<<endl;
   */
   
-//
-// PJA MAC OSX 30-09-01 
-// previous implementation was causing Mac OSX to misbehave. This version
-// places less stress on compiler and runs on Mac
-
 extern SG_EXPORT std::ostream& notify(const NotifySeverity severity);
-// {
-//     static bool initilized = false;
-//     if (!initilized) initilized = initNotifyLevel();
-// 
-//     if (severity<=g_NotifyLevel)
-//     {
-//         if (severity<=osg::WARN) return std::cerr;
-//         else return std::cout;
-//     }
-//     cout << "doing a notify to null stream "<<osg::g_NotifyLevel<<" "<<osg::g_NotifyNulStream.get()<<" "<<osg::g_NotifyInit<<endl;
-//     //if (osg::g_NotifyNulStream.get()==0L) abort();
-//     return std::cout;    
-//     //return *osg::g_NotifyNulStream;
-// }
 
 inline std::ostream& notify(void) { return notify(osg::INFO); }
 
diff --git a/include/osg/UnitTestFramework b/include/osg/UnitTestFramework
index 44bcdd6b4..72b0302dc 100644
--- a/include/osg/UnitTestFramework
+++ b/include/osg/UnitTestFramework
@@ -24,7 +24,6 @@
 #include <vector>
 #include <list>
 #include <fstream>
-#include <ostream>
 
 namespace osgUtx{
 
diff --git a/src/osg/Notify.cpp b/src/osg/Notify.cpp
index 003cc4c3c..ef128e8bc 100644
--- a/src/osg/Notify.cpp
+++ b/src/osg/Notify.cpp
@@ -13,6 +13,7 @@
 #include <osg/Notify>
 #include <string>
 #include <iostream>
+#include <fstream>
 
 using namespace std;
 
diff --git a/src/osgGA/AnimationPathManipulator.cpp b/src/osgGA/AnimationPathManipulator.cpp
index 2169e2b51..754571001 100644
--- a/src/osgGA/AnimationPathManipulator.cpp
+++ b/src/osgGA/AnimationPathManipulator.cpp
@@ -1,5 +1,6 @@
 #include <osgGA/AnimationPathManipulator>
-#include <stdio.h>
+
+#include <fstream>
 
 using namespace osgGA;
 
diff --git a/src/osgProducer/ViewerEventHandler.cpp b/src/osgProducer/ViewerEventHandler.cpp
index 92fa350d4..1f1a19407 100644
--- a/src/osgProducer/ViewerEventHandler.cpp
+++ b/src/osgProducer/ViewerEventHandler.cpp
@@ -5,6 +5,7 @@
 #include <osg/BlendFunc>
 
 #include <algorithm>
+#include <fstream>
 
 using namespace osgProducer;