]> SALOME platform Git repositories - modules/visu.git/commitdiff
Salome HOME
Change # include <strstream> by #include <sstream>
authorgdd <gdd>
Mon, 8 Nov 2010 12:59:44 +0000 (12:59 +0000)
committergdd <gdd>
Mon, 8 Nov 2010 12:59:44 +0000 (12:59 +0000)
and replace strstream, ostrstream, istrstream by
stringstream, ostringstream, istringstream

src/CONVERTOR/VISUConvertor.cxx
src/CONVERTOR/VISU_TableReader.cxx
src/VISU_I/VISU_ColoredPrs3d_i.cc
src/VISU_I/VISU_DumpPython.cc
src/VISU_I/VISU_Gen_i.cc
src/VISU_I/VISU_MultiResult_i.cc

index c3f7de918ea464a68847601d91bc9a963269b3b9..cccc863fc52862a9d7c7569037d6c88edceed5aa 100644 (file)
@@ -32,7 +32,7 @@
 #include "VISU_TableReader.hxx"
 
 #include <fstream>      
-#include <strstream>
+#include <sstream>
 #include <memory>       
 
 #include <vtkCellType.h>
index d01a7b52a0da0643448a8915f5a9d41bad41a2c1..dc941e43c74f7827a6678cb0d3d66c656175accd 100644 (file)
@@ -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 );
index 5157647fc797ca61e362f400df3cd07b142cc1f5..cbf800a33dc7cda558ba61677ba4a273c8f50107 100644 (file)
@@ -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()) {
index 5ba81d944e9bd36e267a7cf4b0cfb651e713a8bf..55b74b230037a11a3ebbf5642d6b08d96ca80e0b 100644 (file)
@@ -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 = "";
index 7ab656d458ae915fa07830a654886283baabbae7..240cc2d5ef4e03f016e8ca12dde98c0732f345a4 100644 (file)
@@ -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() );
index 9aad0f2d0c5c69b83cdb8ca56f9b61e1019556fe..af3e6274b3f11fe7f3ac4fdaf8889551d078b3e1 100644 (file)
@@ -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<<";";