http://salome.mantis.opencascade.com/view.php?id=22318: eliminating compiler errors...

- Included windows.h
- Ambiguity resolved for CORBA::String_Var::operator[]

diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx
index d896e90070213f8277e3cc1a75d6fcacd8e4b80e..94011095b6705ebf3d833b1e11c7ec42734a6381 100644 (file)
--- a/src/SMESH/SMESH_Gen.cxx
+++ b/src/SMESH/SMESH_Gen.cxx
@@ -46,6 +46,10 @@
 
 #include "memoire.h"
 
+#ifdef WNT
+#include <windows.h>
+#endif
+
 using namespace std;
 
 //=============================================================================

diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx
index c5bd6224d0455d838711abef2e9d8a502df35112..1b48dad3264b3b7287f03dca0e18ad5fbe37e742 100644 (file)
--- a/src/SMESH_I/SMESH_DumpPython.cxx
+++ b/src/SMESH_I/SMESH_DumpPython.cxx
@@ -1003,7 +1003,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
       anEntry = aLine.SubString( aSeq->Value(i), aSeq->Value(i + 1) );
       // is a GEOM object?
       CORBA::String_var geomName = geom->GetDumpName( anEntry.ToCString() );
-      if ( !geomName.in() || !geomName[0] ) {
+      if ( !geomName.in() || !geomName.in()[0] ) {
         // is a SMESH object
         if ( theObjectNames.IsBound( anEntry )) {
           // 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.
     CORBA::String_var compDataType = ComponentDataType();
     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 += script.in();
     }