From: stv <stv@opencascade.com>
Date: Mon, 30 May 2005 09:11:24 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: T3_0_0_a1~82
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b3e53d0afc6577c9d2c32efaf09082d34c53e823;p=modules%2Fgui.git

*** empty log message ***
---

diff --git a/src/Event/SALOME_Event.cxx b/src/Event/SALOME_Event.cxx
index 326dd074c..84928f623 100755
--- a/src/Event/SALOME_Event.cxx
+++ b/src/Event/SALOME_Event.cxx
@@ -34,12 +34,6 @@
 #include <qapplication.h>
 #include <qthread.h>
 
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
-
 // asv 21.02.05 : introducing multi-platform approach of thread comparison
 // on Unix using pthread_t type for storing ThreadId
 // on Win32 using integer type for storing ThreadId
@@ -47,11 +41,14 @@ static int MYDEBUG = 0;
 // "...Do not allow your program to rely on the internal structure or size of the pthread_t..."
 
 #ifdef WIN32
-  #include <windows.h>
-  static DWORD myThread;
+#include <windows.h>
+
+static DWORD myThread;
 #else
-  #include <qthread.h>
-  static pthread_t myThread;
+#include <qthread.h>
+#include <pthread.h>
+
+static pthread_t myThread;
 #endif
 
 void SALOME_Event::GetSessionThread(){
diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index 7b3be6549..c7dff3b68 100644
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -258,7 +258,7 @@ void SalomeApp_Study::dataModelInserted (const CAM_DataModel* dm)
         aComp = aBuilder->NewComponent(dm->module()->name());
 
         // Set default engine IOR
-        aBuilder->DefineComponentInstance(aComp, SalomeApp_Application::defaultEngineIOR());
+        aBuilder->DefineComponentInstance(aComp, SalomeApp_Application::defaultEngineIOR().latin1());
       }
     }
   }
diff --git a/src/VTKViewer/VTKViewer_ConvexTool.cxx b/src/VTKViewer/VTKViewer_ConvexTool.cxx
index 5d0736baa..80e7fee5e 100644
--- a/src/VTKViewer/VTKViewer_ConvexTool.cxx
+++ b/src/VTKViewer/VTKViewer_ConvexTool.cxx
@@ -17,6 +17,7 @@
 #include <vtkMath.h>
 
 #include <set>
+#include <iterator>
 #include <algorithm>
 
 static float FACE_TOLERANCE = 0;
@@ -379,7 +380,6 @@ void GetPolygonalFaces(vtkUnstructuredGrid* theGrid,int cellId,TCellArray &outpu
 	
       
       TPTOIDS new_face2faces; // which connected and in one plane
-      int count=0;
       
       TPTOIDS::const_iterator aF2FIter = face2face.begin();
       for(;aF2FIter!=face2face.end();aF2FIter++){