0026377: Passing Handle objects as arguments to functions as non-const reference...

[occt.git] / src / DDF / DDF_IOStream.hxx

diff --git a/src/DDF/DDF_IOStream.hxx b/src/DDF/DDF_IOStream.hxx
old mode 100755 (executable)
new mode 100644 (file)
index 831e0bb..bd9419a
--- a/src/DDF/DDF_IOStream.hxx
+++ b/src/DDF/DDF_IOStream.hxx
@@ -1,12 +1,18 @@
-// File:       DDF_IOStream.hxx
-//             --------------
-// Author:     DAUTRY Philippe
-//             <fid@fox.paris1.matra-dtv.fr>
-// Copyright:  Matra Datavision 1997
-
-// Version:    0.0
-// History:    Version Date            Purpose
-//             0.0     Aug 22 1997     Creation
+// Created on: 1997-08-22
+// Created by: DAUTRY Philippe
+// Copyright (c) 1997-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 // This file has been written using FSD_File.hxx as template.
 // This is a specific adaptation for Draw use (save & restore commands).
@@ -18,52 +24,11 @@
 #ifndef DDF_IOStream_HeaderFile
 #define DDF_IOStream_HeaderFile
 
-// File generated by CPPExt (Value)
-//                     Copyright (C) 1991,1995 by
-//  
-//                      MATRA DATAVISION, FRANCE
-//  
-// This software is furnished in accordance with the terms and conditions
-// of the contract and with the inclusion of the above copyright notice.
-// This software or any other copy thereof may not be provided or otherwise
-// be made available to any other person. No title to an ownership of the
-// software is hereby transferred.
-//  
-// At the termination of the contract, the software and all copies of this
-// software must be deleted.
-
 #include <stdio.h>
 
-#ifndef _Storage_BaseDriver_HeaderFile
 #include <Storage_BaseDriver.hxx>
-#endif
-#ifndef _Storage_Error_HeaderFile
 #include <Storage_Error.hxx>
-#endif
-#ifndef _Storage_OpenMode_HeaderFile
 #include <Storage_OpenMode.hxx>
-#endif
-#ifndef _Standard_Boolean_HeaderFile
-#include <Standard_Boolean.hxx>
-#endif
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _Standard_Character_HeaderFile
-#include <Standard_Character.hxx>
-#endif
-#ifndef _Standard_ExtCharacter_HeaderFile
-#include <Standard_ExtCharacter.hxx>
-#endif
-#ifndef _Standard_Real_HeaderFile
-#include <Standard_Real.hxx>
-#endif
-#ifndef _Standard_ShortReal_HeaderFile
-#include <Standard_ShortReal.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
 #include <Storage_Position.hxx>
 
 class Storage_StreamTypeMismatchError;
@@ -71,20 +36,9 @@ class Storage_StreamFormatError;
 class Storage_StreamWriteError;
 class Storage_StreamExtCharParityError;
 
-class TColStd_SequenceOfExtendedString;
-
-#ifndef Standard_EXPORT
-#ifdef WNT
-#define Standard_EXPORT __declspec(dllexport)
-#else
-#define Standard_EXPORT
-#endif
-#endif
-#ifdef WNT
-#pragma warning (disable : 4275)
-#endif
+#include <TColStd_SequenceOfExtendedString.hxx>
 
-class Standard_EXPORT DDF_IOStream  : public Storage_BaseDriver {
+class DDF_IOStream  : public Storage_BaseDriver {
 
 public:
 
@@ -102,6 +56,7 @@ static  Storage_Error IsGoodFileType(istream* anIStream) ;
   Storage_Error EndWriteInfoSection() ;
   Storage_Error BeginReadInfoSection() ;
   void ReadInfo(Standard_Integer& nbObj,TCollection_AsciiString& dbVersion,TCollection_AsciiString& date,TCollection_AsciiString& schemaName,TCollection_AsciiString& schemaVersion,TCollection_ExtendedString& appName,TCollection_AsciiString& appVersion,TCollection_ExtendedString& objectType,TColStd_SequenceOfAsciiString& userInfo) ;
+  void ReadCompleteInfo (Standard_IStream& theIStream, Handle(Storage_Data)& theData);
   Storage_Error EndReadInfoSection() ;
   Storage_Error BeginWriteCommentSection() ;
   void WriteComment(const TColStd_SequenceOfExtendedString& userComments) ;
@@ -256,7 +211,7 @@ private:
 
  // Methods PRIVATE
  // 
-static const Standard_CString MagicNumber() ;
+static Standard_CString MagicNumber() ;
 
 
  // Fields PRIVATE
@@ -268,7 +223,7 @@ ostream* myOStream;
 
 };
 
-#ifdef WNT
+#ifdef _MSC_VER
 #pragma warning (default : 4275)
 #endif