From cf05bd5dd16fb3ad87d48004fc16d996c96d77eb Mon Sep 17 00:00:00 2001
From: san <san@opencascade.com>
Date: Fri, 20 Sep 2013 15:31:14 +0000
Subject: [PATCH] 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[]

---
 src/SMESH/SMESH_Gen.cxx          | 4 ++++
 src/SMESH_I/SMESH_DumpPython.cxx | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx
index d896e9007..94011095b 100644
--- 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 c5bd6224d..1b48dad32 100644
--- 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();
     }
-- 
2.39.2