Import Geant4 6.1.0 source tree

source/visualization/HepRep/include/zipios++/deflateoutputstreambuf.h

@@ -6,7 +6,7 @@
 #include "zipios++/meta-iostreams.h"
 #include <vector>
 
-#include <zlib.h>
+#include <HepRep-zlib.h>
 
 #include "zipios++/filteroutputstreambuf.h"
 #include "zipios++/ziphead.h"

source/visualization/HepRep/include/zipios++/gzipoutputstreambuf.h

@@ -5,7 +5,7 @@
 
 #include <vector>
 
-#include <zlib.h>
+#include <HepRep-zlib.h>
 
 #include "zipios++/deflateoutputstreambuf.h"
 

source/visualization/HepRep/include/zipios++/inflateinputstreambuf.h

@@ -6,7 +6,7 @@
 #include "zipios++/meta-iostreams.h"
 #include <vector>
 
-#include <zlib.h>
+#include <HepRep-zlib.h>
 
 #include "zipios++/filterinputstreambuf.h"
 

source/visualization/HepRep/include/zipios++/outputstringstream.h

@@ -14,8 +14,7 @@ typedef std::ostringstream OutputStringStream ;
 
 #else
 
-// MD added include strstream.h (not strstream, since it does not exist on Solaris)
-#include <strstream.h>
+#include <strstream>
 
 /** OutputStringStream is typedefed to ostringstream if sstream is
     part of the standard library (unless Zipios++ has been explicitly
@@ -24,14 +23,14 @@ typedef std::ostringstream OutputStringStream ;
     strstream.h. In this case OutputStringStream specializes the str()
     method, such that the caller does not have to concern himself with
     null-terminating the string and unfreezing the ostrstream. */
-class OutputStringStream : public ostrstream {
+class OutputStringStream : public std::ostrstream {
 public:
 
   /** Specialization of ostrstream::str() that takes care of
       null-terminating the string and unfreezing the ostrstream.  */
   inline string str() {
-    *this << ends ; // null terminate ostrstream
-    string o_str( ostrstream::str() ) ;
+    *this << std::ends ; // null terminate ostrstream
+    string o_str( std::ostrstream::str() ) ;
     freeze( 0 ) ;
     return o_str ;
   }

source/visualization/HepRep/include/zipios++/simplesmartptr.h

@@ -127,7 +127,7 @@ public:
 
   /** The assignment operator doesn't copy the reference count, it
       leaves it unchanged.  */
-  const ReferenceCount &operator= ( const ReferenceCount &src ) {}
+  const ReferenceCount &operator= ( const ReferenceCount &src ) { return *this; }
 private:
 
   /** Increases the reference count. */

source/visualization/HepRep/include/zipios++/zipinputstreambuf.h

@@ -5,7 +5,7 @@
 
 #include <vector>
 
-#include <zlib.h>
+#include <HepRep-zlib.h>
 
 #include "zipios++/fcoll.h"
 #include "zipios++/inflateinputstreambuf.h"

source/visualization/HepRep/include/zipios++/zipios-config.h

@@ -59,4 +59,4 @@
 #endif
 #endif
 
-#include <assert.h>
+#include <cassert>

source/visualization/HepRep/include/zipios++/zipoutputstreambuf.h

@@ -5,7 +5,7 @@
 
 #include <vector>
 
-#include <zlib.h>
+#include <HepRep-zlib.h>
 
 #include "zipios++/fcoll.h"
 #include "zipios++/deflateoutputstreambuf.h"