From d1bcb2a2320e353218f1407a9ac342dbfbf401f7 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 25 Feb 2009 09:46:29 +0000 Subject: [PATCH] Replace strstream by sstream --- src/Container/SALOME_Container.cxx | 2 +- src/Logger/SALOME_Trace.cxx | 4 ++-- src/Logger/SALOME_Trace.hxx | 4 ++-- src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_StudyManager_i.cxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx | 4 ++-- src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.hxx | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx index 07024cd13..1cb421223 100644 --- a/src/Container/SALOME_Container.cxx +++ b/src/Container/SALOME_Container.cxx @@ -30,7 +30,7 @@ #endif #include -#include +#include #include #include #include diff --git a/src/Logger/SALOME_Trace.cxx b/src/Logger/SALOME_Trace.cxx index ce73c7f6d..3617c6c4b 100644 --- a/src/Logger/SALOME_Trace.cxx +++ b/src/Logger/SALOME_Trace.cxx @@ -144,9 +144,9 @@ void SALOME_Trace::putMessage(ostream& msg) // CORBA::String_var LogMsg = CORBA::string_dup( str() ); //Allow automatic deletion of ostrstream content - char* adt = str(); + const char* adt = str().c_str(); CORBA::String_var LogMsg = CORBA::string_dup( adt ); - rdbuf()->freeze(false); + //rdbuf()->freeze(false); //rdbuf()->sync(); // problem with gcc3.2 seekp(0); diff --git a/src/Logger/SALOME_Trace.hxx b/src/Logger/SALOME_Trace.hxx index a9d2ebd7f..261d27005 100644 --- a/src/Logger/SALOME_Trace.hxx +++ b/src/Logger/SALOME_Trace.hxx @@ -27,7 +27,7 @@ #if !defined(AFX_LOGGER_H__96F2A3AB_F6F8_11D6_BFA6_000476A0958C__INCLUDED_) #define AFX_LOGGER_H__96F2A3AB_F6F8_11D6_BFA6_000476A0958C__INCLUDED_ -#include +#include #include #include "Logger.hh" @@ -62,7 +62,7 @@ # endif /* WIN32 */ -class SALOME_Trace : public std::ostrstream +class SALOME_Trace : public std::ostringstream { public: virtual ~SALOME_Trace(); diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx index 992bd9163..01a3f03bd 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx @@ -29,7 +29,7 @@ #include "Utils_ExceptHandlers.hxx" #include -#include +#include #include #include diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx index 9a4de029d..30ee7075b 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx @@ -26,7 +26,7 @@ #include "SALOMEDS_AttributeTableOfReal_i.hxx" #include "SALOMEDS.hxx" -#include +#include #include #include diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx index 56a29f66a..ebc8ebd76 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx @@ -26,7 +26,7 @@ #include "SALOMEDS_AttributeTableOfString_i.hxx" #include "SALOMEDS.hxx" -#include +#include #include #include diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx index 63bd4acd8..c579fa47f 100644 --- a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx @@ -41,7 +41,7 @@ #include "Basics_Utils.hxx" #include "SALOME_GenericObj_i.hh" -#include +#include #include #include diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx index 441e578a1..9f012789c 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include using namespace std; @@ -710,7 +710,7 @@ void SALOMEDSImpl_AttributeParameter::Load(const string& theValue) _realarrays.clear(); _intarrays.clear(); - istrstream buffer(theValue.c_str(), theValue.size()); + istringstream buffer(theValue.c_str()); int size, val, ival; double val2; diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx index da906393c..24a21d772 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx @@ -24,7 +24,7 @@ // Module : SALOME // #include "SALOMEDSImpl_AttributeTableOfInteger.hxx" -#include +#include using namespace std; diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx index 1b9dd68c6..af1baaacd 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx @@ -25,7 +25,7 @@ // #include "SALOMEDSImpl_AttributeTableOfReal.hxx" #include -#include +#include using namespace std; diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx index f5872c4ad..c73f7c730 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx @@ -26,7 +26,7 @@ #include "SALOMEDSImpl_AttributeTableOfString.hxx" #include #include -#include +#include using namespace std; diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.hxx index 4a0b2ef77..b98a47364 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.hxx @@ -29,7 +29,7 @@ #include "SALOMEDSImpl_Defines.hxx" // std C++ headers -#include +#include #include #include -- 2.39.2