mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-13 18:20:34 +05:00
http://salome.mantis.opencascade.com/view.php?id=22318: eliminating compiler errors issued by VC++ 2008
- Included windows.h - Ambiguity resolved for CORBA::String_Var::operator[]
This commit is contained in:
parent
6920cb0594
commit
cf05bd5dd1
@ -46,6 +46,10 @@
|
|||||||
|
|
||||||
#include "memoire.h"
|
#include "memoire.h"
|
||||||
|
|
||||||
|
#ifdef WNT
|
||||||
|
#include <windows.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
@ -1003,7 +1003,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
|
|||||||
anEntry = aLine.SubString( aSeq->Value(i), aSeq->Value(i + 1) );
|
anEntry = aLine.SubString( aSeq->Value(i), aSeq->Value(i + 1) );
|
||||||
// is a GEOM object?
|
// is a GEOM object?
|
||||||
CORBA::String_var geomName = geom->GetDumpName( anEntry.ToCString() );
|
CORBA::String_var geomName = geom->GetDumpName( anEntry.ToCString() );
|
||||||
if ( !geomName.in() || !geomName[0] ) {
|
if ( !geomName.in() || !geomName.in()[0] ) {
|
||||||
// is a SMESH object
|
// is a SMESH object
|
||||||
if ( theObjectNames.IsBound( anEntry )) {
|
if ( theObjectNames.IsBound( anEntry )) {
|
||||||
// The Object is in Study
|
// The Object is in Study
|
||||||
@ -1151,7 +1151,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
|
|||||||
//Output the script that sets up the visual parameters.
|
//Output the script that sets up the visual parameters.
|
||||||
CORBA::String_var compDataType = ComponentDataType();
|
CORBA::String_var compDataType = ComponentDataType();
|
||||||
CORBA::String_var script = theStudy->GetDefaultScript( compDataType.in(), tab.ToCString() );
|
CORBA::String_var script = theStudy->GetDefaultScript( compDataType.in(), tab.ToCString() );
|
||||||
if ( script.in() && script[0] ) {
|
if ( script.in() && script.in()[0] ) {
|
||||||
visualPropertiesPart += nt + "### Store presentation parameters of displayed objects\n";
|
visualPropertiesPart += nt + "### Store presentation parameters of displayed objects\n";
|
||||||
visualPropertiesPart += script.in();
|
visualPropertiesPart += script.in();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user