Update from August 4, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@294 18c085ea-50e0-402c-830e-de6fd14e8384

clearcase_bin/visit-build-open

@@ -51,7 +51,7 @@ esac
 #
 kickit=true
 sunspot=true
-hyper=false
+hyper=true
 gps=true
 riptide=true
 frost=true
@@ -183,11 +183,6 @@ env CXXFLAGS=-O2 ./configure >> ../buildlog 2>&1
 make -j 4 >> ../buildlog 2>&1
 clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
 mv visit\$ver2.linux.tar.gz ..
-make distclean >> ../buildlog 2>&1
-env CXXFLAGS=-O2 ./configure --enable-fake-exceptions >> ../buildlog 2>&1
-make -j 4 >> ../buildlog 2>&1
-clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
-mv visit\$ver2.linux.tar.gz ../visit\$ver2.linux_suse.tar.gz
 cd ..
 rm -f resultlog
 echo "        build of visit on kickit"       > resultlog 2>&1
@@ -335,7 +330,7 @@ cd $dist
 ver=\`cat VERSION\`
 ver2=\`echo \$ver | tr "." "_"\`
 env CXXFLAGS=-O2 MAKE=gmake ./configure --enable-parallel >> ../buildlog 2>&1
-gmake -j 3 >> ../buildlog 2>&1
+gmake >> ../buildlog 2>&1
 clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
 mv visit\$ver2.osf1.tar.gz ..
 cd ..

clearcase_bin/visit-install-open

@@ -204,7 +204,6 @@ then
    if [ $test = no ]
    then
       scp kickit:/var/tmp/$user/kickit/visitbuild/visit$ver2.linux.tar.gz .
-      scp kickit:/var/tmp/$user/kickit/visitbuild/visit$ver2.linux_suse.tar.gz .
       scp visit$ver2.linux.tar.gz kickit:
       scp visit-install kickit:
       scp kickit kickit:kickit_install

common/comm/testcomm.C

-#include <iostream.h>
+#include <visitstream.h>
 #include <string>
 #include <string.h>
 

common/misc/DebugStream.C

@@ -390,11 +390,16 @@ DebugStream::DebugStreamBuf::overflow(int c)
 //    Jeremy Meredith, Fri Jun  1 17:18:46 PDT 2001
 //    Added initialization of 'enabled'.
 //
+//    Eric Brugger, Tue Aug  3 11:03:38 PDT 2004
+//    Change the DebugStreamBuf member to be a pointered value instead of a
+//    referenced value so that it works with the MIPSpro compiler.
+//
 // ****************************************************************************
-DebugStream::DebugStream(int level_) : ostream(&buf)
+DebugStream::DebugStream(int level_) : ostream(new DebugStreamBuf)
 {
     level = level_;
-    buf.SetLevel(level);
+    buf = (DebugStreamBuf*)(rdbuf());
+    buf->SetLevel(level);
     enabled = false;
 }
 
@@ -408,10 +413,15 @@ DebugStream::DebugStream(int level_) : ostream(&buf)
 //  Programmer:  Jeremy Meredith
 //  Creation:    November 17, 2000
 //
+//  Modifications:
+//    Eric Brugger, Tue Aug  3 11:03:38 PDT 2004
+//    Change the DebugStreamBuf member to be a pointered value instead of a
+//    referenced value so that it works with the MIPSpro compiler.
+//
 // ****************************************************************************
 DebugStream::~DebugStream()
 {
-    buf.close();
+    buf->close();
 }
 
 
@@ -431,13 +441,17 @@ DebugStream::~DebugStream()
 //    Jeremy Meredith, Fri Jun  1 17:25:01 PDT 2001
 //    Added setting of 'enabled' to true.
 //
+//    Eric Brugger, Tue Aug  3 11:03:38 PDT 2004
+//    Change the DebugStreamBuf member to be a pointered value instead of a
+//    referenced value so that it works with the MIPSpro compiler.
+//
 // ****************************************************************************
 void
 DebugStream::open(const char *progname)
 {
     char filename[256];
     sprintf(filename, "%s.%d.log", progname, level);
-    buf.open(filename);
+    buf->open(filename);
     enabled = true;
 }
 
@@ -458,11 +472,15 @@ DebugStream::open(const char *progname)
 //    Added setting enabled to false so we won't try to close it
 //    more than once.
 //
+//    Eric Brugger, Tue Aug  3 11:03:38 PDT 2004
+//    Change the DebugStreamBuf member to be a pointered value instead of a
+//    referenced value so that it works with the MIPSpro compiler.
+//
 // ****************************************************************************
 void
 DebugStream::close()
 {
-    buf.close();
+    buf->close();
     enabled = false;
 }
 

common/misc/DebugStream.h

@@ -6,8 +6,7 @@
 #define DEBUG_STREAM_H
 #include <misc_exports.h>
 
-#include <iostream.h>
-#include <fstream.h>
+#include <visitstream.h>
 #include <vector>
 #include <signal.h>
 #include <stdlib.h>
@@ -41,6 +40,10 @@
 //    do the formatting if the debug output was disabled.  Removed the
 //    ability to delete a debug stream automatically on close.
 //
+//    Eric Brugger, Tue Aug  3 11:00:56 PDT 2004
+//    Change the DebugStreamBuf member to be a pointered value instead of
+//    a referenced value so that it works with the MIPSpro compiler.
+//
 // ****************************************************************************
 
 class MISC_API DebugStream : public ostream
@@ -83,7 +86,7 @@ class MISC_API DebugStream : public ostream
 
 
     // the streambuf used for this ostream
-    DebugStreamBuf   buf;
+    DebugStreamBuf  *buf;
     // the level of this DebugStream
     int              level;
     // true if enabled

common/misc/PTY.C

@@ -101,7 +101,7 @@ pty_fork(int &fdm, void (*sigchld_handler)(int), char *slave_name)
 //  Creation:    April 27, 2001
 //
 // ****************************************************************************
-#include <iostream.h>
+#include <visitstream.h>
 int
 ptym_open(char *pts_name)
 {

common/misc/TimingsManager.C

@@ -7,7 +7,7 @@
 
 #include <map>
 #include <float.h>
-#include <fstream.h>
+#include <visitstream.h>
 #include <time.h>
 #include <stdio.h>
 

common/misc/TimingsManager.h

@@ -5,7 +5,7 @@
 #ifndef TIMINGS_MANAGER_H
 #define TIMINGS_MANAGER_H
 
-#include <iostream.h>
+#include <visitstream.h>
 #if defined(_WIN32)
 #include <sys/timeb.h>
 #else

common/misc/VisItException.h

@@ -6,7 +6,7 @@
 #define VISIT_EXCEPTION_H
 
 #include <exception>
-#include <iostream.h>
+#include <visitstream.h>
 #include <string>
 #ifdef FAKE_EXCEPTIONS
 #include <setjmp.h>

common/parser/ExprConfig.C

 #include "ExprGrammar.h"
-#include <fstream.h>
+#include <visitstream.h>
 
 // ****************************************************************************
 //  Method:  ExprGrammar::Initialize

common/parser/ParserBase.h

@@ -3,7 +3,7 @@
 #include <parser_exports.h>
 
 #include <vector>
-#include <iostream.h>
+#include <visitstream.h>
 
 #include <ParserInterface.h>
 #include <Token.h>

common/parser/Pos.h

@@ -2,7 +2,7 @@
 #define POS_H
 #include <parser_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <string>
 
 // ****************************************************************************

common/parser/Scanner.C

 #include <string.h>
-#include <iostream.h>
+#include <visitstream.h>
 #include <string>
 #include <deque>
 using std::string;

common/parser/Scanner.h

@@ -3,7 +3,7 @@
 #include <parser_exports.h>
 
 #include <string.h>
-#include <iostream.h>
+#include <visitstream.h>
 #include <string>
 #include <deque>
 using std::string;

common/parser/Symbol.h

@@ -5,7 +5,7 @@
 #include <vector>
 #include <string>
 #include <map>
-#include <iostream.h>
+#include <visitstream.h>
 
 #define MAXSYMBOLS 64
 struct SymbolSet;

common/plugin/DatabasePluginManager.C

@@ -6,7 +6,7 @@
 #include <DatabasePluginInfo.h>
 #include <DebugStream.h>
 #include <InvalidPluginException.h>
-#include <iostream.h>
+#include <visitstream.h>
 #include <string>
 #include <vector>
 

common/plugin/OperatorPluginManager.C

@@ -6,7 +6,7 @@
 #include <OperatorPluginInfo.h>
 #include <DebugStream.h>
 #include <InvalidPluginException.h>
-#include <iostream.h>
+#include <visitstream.h>
 #include <string>
 #include <vector>
 

common/plugin/PlotPluginManager.C

@@ -6,7 +6,7 @@
 #include <PlotPluginInfo.h>
 #include <DebugStream.h>
 #include <InvalidPluginException.h>
-#include <iostream.h>
+#include <visitstream.h>
 #include <string>
 #include <vector>
 

common/plugin/PluginManager.C

@@ -7,7 +7,7 @@
 #include <InvalidDirectoryException.h>
 #include <InvalidPluginException.h>
 #include <visit-config.h>
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string>
 #include <vector>

common/siloobj/Field.C

@@ -2,7 +2,7 @@
 //                                Field.C                                    //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj/Field.h

@@ -6,7 +6,7 @@
 #define FIELD_H
 #include <siloobj_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <silo.h>
 
 #include <Value.h>

common/siloobj/IntervalTree.C

@@ -2,7 +2,7 @@
 //                             IntervalTree.C                                //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj/IntervalTree.h

@@ -6,7 +6,7 @@
 #define INTERVAL_TREE_H
 #include <siloobj_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <silo.h>
 
 

common/siloobj/Material.C

@@ -2,7 +2,7 @@
 //                               Material.C                                  //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj/Material.h

@@ -6,7 +6,7 @@
 #define MATERIAL_H
 #include <siloobj_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 
 #include <silo.h>
 

common/siloobj/Mesh.h

@@ -6,7 +6,7 @@
 #define MESH_H
 #include <siloobj_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <silo.h>
 
 

common/siloobj/OnionPeel.h

@@ -6,7 +6,7 @@
 #define ONION_PEEL_H
 #include <siloobj_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <silo.h>
 
 

common/siloobj/SiloObjLib.h

@@ -44,7 +44,7 @@ typedef enum
 // Inline functions
 //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj/StructuredTopology.C

@@ -2,7 +2,7 @@
 //                          StructuredTopology.C                             //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj/StructuredTopology.h

@@ -6,7 +6,7 @@
 #define STRUCTURED_TOPOLOGY_H
 #include <siloobj_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 
 #include <silo.h>
 

common/siloobj/TimeSequence.C

@@ -2,7 +2,7 @@
 //                             TimeSequence.C                                //
 // ************************************************************************* //
 
-#include <iostream.h> 
+#include <visitstream.h> 
 #include <silo.h>
 #include <stdlib.h>
 #include <string.h>

common/siloobj/TimeSequence.h

@@ -7,7 +7,7 @@
 #include <siloobj_exports.h>
 
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <silo.h>
 
 

common/siloobj/UnstructuredTopology.h

@@ -6,7 +6,7 @@
 #define UNSTRUCTURED_TOPOLOGY_H
 #include <siloobj_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <silo.h>
 
 #include <SiloObjLib.h>

common/siloobj/Value.C

@@ -2,7 +2,7 @@
 //                                 Value.C                                   //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj/Value.h

@@ -6,7 +6,7 @@
 #define VALUE_H
 #include <siloobj_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <silo.h>
 
 

common/siloobj_vtk_db/Database_VTK.C

@@ -2,7 +2,7 @@
 //                             Database_VTK.C                                //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj_vtk_db/Field_VTK.C

@@ -2,7 +2,7 @@
 //                              Field_VTK.C                                  //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj_vtk_db/IntervalTree_VTK.C

@@ -2,7 +2,7 @@
 //                           IntervalTree_VTK.C                              //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 
 #include <IntervalTree_VTK.h>
 #include <SiloObjLib.h>

common/siloobj_vtk_db/IntervalTree_VTK.h

@@ -6,7 +6,7 @@
 #define INTERVAL_TREE_VTK_H
 #include <siloobj_vtk_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <silo.h>
 
 #include <IntervalTree.h>

common/siloobj_vtk_db/MeshTableOfContents.C

@@ -2,7 +2,7 @@
 //                            MeshTableOfContents.C                          //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj_vtk_db/Mesh_VTK.C

@@ -2,7 +2,7 @@
 //                               Mesh_VTK.C                                  //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj_vtk_db/Mesh_VTK.h

@@ -6,7 +6,7 @@
 #define MESH_VTK_H
 #include <siloobj_vtk_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 
 #include <silo.h>
 

common/siloobj_vtk_db/StateTableOfContents.C

@@ -2,7 +2,7 @@
 //                           StateTableOfContents.C                          //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj_vtk_db/TableOfContents.C

@@ -2,7 +2,7 @@
 //                              TableOfContents.C                            //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/siloobj_vtk_db/UnstructuredTopology_VTK.h

@@ -6,7 +6,7 @@
 #define UNSTRUCTURED_TOPOLOGY_VTK_H
 #include <siloobj_vtk_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 
 #include <silo.h>
 

common/siloobj_vtk_db/Value_VTK.C

@@ -2,7 +2,7 @@
 //                              Value_VTK.C                                  //
 // ************************************************************************* //
 
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdlib.h>
 #include <string.h>
 

common/state/AttributeGroup.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 #include <exception>
-#include <iostream.h>
+#include <visitstream.h>
 
 // Forward declaration
 class AttributeGroup;

common/state/DatabaseCorrelation.h

@@ -3,7 +3,7 @@
 #include <state_exports.h>
 #include <string>
 #include <AttributeSubject.h>
-#include <iostream.h>
+#include <visitstream.h>
 
 // ****************************************************************************
 // Class: DatabaseCorrelation

common/state/DatabaseCorrelationList.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <AttributeSubject.h>
 class DatabaseCorrelation;
-#include <iostream.h>
+#include <visitstream.h>
 
 // ****************************************************************************
 // Class: DatabaseCorrelationList

common/state/PickAttributes.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <AttributeSubject.h>
 class PickVarInfo;
-#include <iostream.h>
+#include <visitstream.h>
 
 // ****************************************************************************
 // Class: PickAttributes

common/state/QueryAttributes.h

@@ -3,7 +3,7 @@
 #include <state_exports.h>
 #include <string>
 #include <AttributeSubject.h>
-#include <iostream.h>
+#include <visitstream.h>
 
 // ****************************************************************************
 // Class: QueryAttributes

common/state/Xfer.C

@@ -2,7 +2,7 @@
 #include <AttributeSubject.h>
 #include <VisItRPC.h>
 #include <Connection.h>
-#include <iostream.h>
+#include <visitstream.h>
 #include <DebugStream.h>
 
 // ****************************************************************************

common/utility/NamingConvention.C

@@ -3,7 +3,7 @@
 // ************************************************************************* //
 
 #include <ctype.h>
-#include <iostream.h>
+#include <visitstream.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

common/utility/Utility.C

@@ -4,7 +4,7 @@
 
 #include <Utility.h>
 
-#include <fstream.h>
+#include <visitstream.h>
 #include <stdio.h>
 #include <string.h>
 

common/utility/array_ref_ptr.h

@@ -2,7 +2,7 @@
 #define ARRAY_REF_PTR_H
 #include <utility_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 
 // ****************************************************************************
 //  Class: array_ref_ptr

common/utility/ref_ptr.h

@@ -2,7 +2,7 @@
 #define REF_PTR_H
 #include <utility_exports.h>
 
-#include <iostream.h>
+#include <visitstream.h>
 
 // ****************************************************************************
 //  Class: ref_ptr

common/utility/visitstream.h

+#ifndef VISIT_STREAM_H
+#define VISIT_STREAM_H
+
+// Include iostream and some using statements.
+#include <iostream>
+
+using std::cerr;
+using std::cout;
+using std::endl;
+using std::ios;
+using std::ostream;
+using std::streambuf;
+
+// Include fstream and some using statements.
+#include <fstream>
+
+using std::ifstream;
+