From: gdd <gdd>
Date: Mon, 8 Nov 2010 12:59:44 +0000 (+0000)
Subject: Change # include <strstream> by #include <sstream>
X-Git-Tag: V5_1_5rc2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=14cbead505b7f549cfc3dad0c9d150f57eb8df00;p=modules%2Fvisu.git

Change # include <strstream> by #include <sstream>
and replace strstream, ostrstream, istrstream by
stringstream, ostringstream, istringstream
---

diff --git a/src/CONVERTOR/VISUConvertor.cxx b/src/CONVERTOR/VISUConvertor.cxx
index c3f7de91..cccc863f 100644
--- a/src/CONVERTOR/VISUConvertor.cxx
+++ b/src/CONVERTOR/VISUConvertor.cxx
@@ -32,7 +32,7 @@
 #include "VISU_TableReader.hxx"
 
 #include <fstream>      
-#include <strstream>
+#include <sstream>
 #include <memory>       
 
 #include <vtkCellType.h>
diff --git a/src/CONVERTOR/VISU_TableReader.cxx b/src/CONVERTOR/VISU_TableReader.cxx
index d01a7b52..dc941e43 100644
--- a/src/CONVERTOR/VISU_TableReader.cxx
+++ b/src/CONVERTOR/VISU_TableReader.cxx
@@ -32,7 +32,7 @@
 
 #include <fstream>
 #include <iostream>
-#include <strstream>
+#include <sstream>
 
 #include <vtkPoints.h>
 #include <vtkDoubleArray.h>
@@ -120,7 +120,7 @@ namespace
   int getLine( std::ifstream& theStmIn, QString& theString )
   {
     char tmp;
-    std::ostrstream aStrOut;
+    std::ostringstream aStrOut;
 
     while ( theStmIn.get( tmp ) ) {
       aStrOut<<tmp;
@@ -129,7 +129,7 @@ namespace
     }
 
     aStrOut<<std::ends;
-    theString = aStrOut.str();
+    theString = aStrOut.str().c_str();
 
     return !theStmIn.eof();
   }
@@ -347,7 +347,7 @@ VISU::ImportTables( const char* theFileName, TTableContainer& theContainer,
         // ************** OLD CODE ******************
         /*
         TValue aVal;
-        istrstream aStream( data );
+        istringstream aStream( data );
         aStream.precision( STRPRECISION );
         while( aStream >> aVal ) {
           aRow.myValues.push_back( aVal );
diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc
index 5157647f..cbf800a3 100644
--- a/src/VISU_I/VISU_ColoredPrs3d_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc
@@ -36,7 +36,7 @@
 #include "SUIT_ResourceMgr.h"
 #include "SALOME_Event.h"
 
-#include <strstream>
+#include <sstream>
 #include <vtkMapper.h>
 #include <vtkDataSet.h>
 
@@ -1144,7 +1144,7 @@ VISU::ColoredPrs3d_i
     aValForTime = anIter->second;
 
   if (aValForTime) {
-    std::strstream aStream;
+    std::stringstream aStream;
     const VISU::TTime& aTime = aValForTime->myTime;
     aStream<<theTitle<<" ";
     if(IsUnitsVisible()) {
diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc
index 5ba81d94..55b74b23 100644
--- a/src/VISU_I/VISU_DumpPython.cc
+++ b/src/VISU_I/VISU_DumpPython.cc
@@ -50,7 +50,7 @@
 #include "utilities.h"
 
 #include <cctype>
-#include <strstream>
+#include <sstream>
 #include <functional>
 
 #include <QString>
@@ -959,7 +959,7 @@ namespace VISU
     CORBA::Long aNbRows = theTableAttr->GetNbRows();
 
     // push values and their indices into streams
-    strstream values, rows, columns;
+    stringstream values, rows, columns;
     string comma = "";
     for(CORBA::Long i = 1; i <= aNbColumns; i++){
       for(CORBA::Long j = aNbRows; j > 0; j--){
@@ -973,7 +973,7 @@ namespace VISU
       }
     }
     // push titles and units into streams
-    strstream rowUnits, rowTitles, colTitles;
+    stringstream rowUnits, rowTitles, colTitles;
     SALOMEDS::StringSeq_var aRowUnits = theTableAttr->GetRowUnits();
     SALOMEDS::StringSeq_var aRowTitles = theTableAttr->GetRowTitles();
     comma = "";
diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index 7ab656d4..240cc2d5 100644
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -86,6 +86,9 @@
 #include "Utils_ExceptHandlers.hxx"
 UNEXPECT_CATCH(SalomeException, SALOME::SALOME_Exception);
 
+// STL Includes
+#include <sstream>
+
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
 namespace filesystem = boost::filesystem;
@@ -1676,7 +1679,7 @@ namespace VISU
       SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir, false);
     if(MYDEBUG) MESSAGE("Result_i::PasteInto - aListOfFileNames->length() = "<<aListOfFileNames->length());
     
-    std::ostrstream aLocalPersistentID;
+    std::ostringstream aLocalPersistentID;
     {
       std::string aCopyPersist =  aTmpDir + "copy_persistent";
       std::ifstream anInputFileStream( aCopyPersist.c_str() );
diff --git a/src/VISU_I/VISU_MultiResult_i.cc b/src/VISU_I/VISU_MultiResult_i.cc
index 9aad0f2d..af3e6274 100644
--- a/src/VISU_I/VISU_MultiResult_i.cc
+++ b/src/VISU_I/VISU_MultiResult_i.cc
@@ -42,7 +42,7 @@
 
 #include <QStringList>
 
-#include <strstream>
+#include <sstream>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
@@ -119,7 +119,7 @@ namespace VISU
   GetPartInfo(const std::string theInfoString)
   {
     MultiResult_i::TPartInfo aPartInfo;
-    std::istrstream anOutputStream(theInfoString.c_str());
+    std::istringstream anOutputStream(theInfoString.c_str());
     anOutputStream>>aPartInfo;
     return aPartInfo;
   }
@@ -957,7 +957,7 @@ VISU::MultiResult_i
   _PTR(SObject) aSObject = aStudy->FindObjectID(aFatherEntry);
   aRestoringMap = Storable::GetStorableMap(aSObject);
 
-  std::ostrstream anOutputStream;
+  std::ostringstream anOutputStream;
   anOutputStream<<"myComment=PART;";
   anOutputStream<<"myName="<<thePartName<<";";
   anOutputStream<<"myMeshName="<<theMeshName<<";";