From b7b489fb34e6c8f86da987ad3436629a0f975e32 Mon Sep 17 00:00:00 2001 From: abd Date: Thu, 8 May 2008 08:23:07 +0000 Subject: [PATCH] Correct compilation under Win32 platform --- src/GEOMClient/GEOM_Client.cxx | 2 -- src/GEOMGUI/GEOM_Displayer.h | 2 -- src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 2 -- src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 2 -- src/GEOMImpl/GEOMImpl_ILocalOperations.cxx | 2 -- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 2 -- src/GEOM_I/GEOM_Gen_i.cc | 3 +-- 7 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx index f5167327c..4c2c91975 100644 --- a/src/GEOMClient/GEOM_Client.cxx +++ b/src/GEOMClient/GEOM_Client.cxx @@ -26,8 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; - #include #include diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index 0a55928bc..87a3f74e7 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -29,8 +29,6 @@ #if !defined (__GEOM_DISPLAYER_H) #define __GEOM_DISPLAYER_H -using namespace std; - #include "GEOM_GEOMGUI.hxx" #include "SALOME_Prs.h" diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index 883c848c7..6be4c561b 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -21,8 +21,6 @@ #pragma warning( disable:4786 ) #endif -using namespace std; - #include #include diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx index dee7cd1fd..614757094 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx @@ -24,8 +24,6 @@ #pragma warning( disable:4786 ) #endif -using namespace std; - #include #include diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx index 2ec4e5e39..967c7b8f6 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx @@ -18,8 +18,6 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -using namespace std; - #include #include diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index fddf2e724..cebaca29d 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -23,8 +23,6 @@ // Project : SALOME // $Header$ -using namespace std; - #include #include "GEOMImpl_IShapesOperations.hxx" diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 106ee9ef6..e45c8268c 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -29,7 +29,6 @@ #include #include "Utils_CorbaException.hxx" -#include "OpUtil.hxx" #include "Utils_ExceptHandlers.hxx" #include "utilities.h" @@ -289,7 +288,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, bool isMultiFile) { SALOMEDS::TMPFile_var aStreamFile; // Get a temporary directory to store a file - std::string aTmpDir = (isMultiFile)?theURL:SALOMEDS_Tool::GetTmpDir(); + std::string aTmpDir = (isMultiFile)?theURL : SALOMEDS_Tool::GetTmpDir(); // OCCT BUG: cannot save a document (in current folder) // if directory name is empty -- 2.39.2