From: prascle <prascle>
Date: Fri, 5 Nov 2004 17:54:42 +0000 (+0000)
Subject: PR: corrections residuelles des anomalies du merge cvs
X-Git-Tag: V2_1_0a1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5f8b068f2428c1e64f304363b849a86efc542145;p=modules%2Fkernel.git

PR: corrections residuelles des anomalies du merge cvs
---

diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx
index 26178c295..47f8fb92d 100644
--- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx
+++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx
@@ -30,10 +30,6 @@
 
 #include "utilities.h"
 
-#include "SALOME_DataTypeCatalog_Handler.hxx"
-
-#include "utilities.h"
-
 using namespace std;
 
 // contains all the data types defined in the catalog
diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx
index d44450d9c..565170301 100755
--- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx
+++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx
@@ -30,10 +30,6 @@
 
 #include "utilities.h"
 
-#include "SALOME_RessourcesCatalog_Handler.hxx"
-
-#include "utilities.h"
-
 using namespace std;
 
 ListOfParserressources _ressources_list;
diff --git a/src/SALOMEGUI/PyInterp_base.cxx b/src/SALOMEGUI/PyInterp_base.cxx
index 83ea5e040..08990e6e5 100644
--- a/src/SALOMEGUI/PyInterp_base.cxx
+++ b/src/SALOMEGUI/PyInterp_base.cxx
@@ -10,7 +10,6 @@
 //  $Header$
 
 
-
 #include <string>
 #include <vector>
 
diff --git a/src/SALOMEGUI/QAD_PyInterp_mono.cxx b/src/SALOMEGUI/QAD_PyInterp_mono.cxx
index 695f64919..611b0e49b 100644
--- a/src/SALOMEGUI/QAD_PyInterp_mono.cxx
+++ b/src/SALOMEGUI/QAD_PyInterp_mono.cxx
@@ -12,8 +12,6 @@
 
 
 
-
-
 #include "QAD_PyInterp_mono.h"
 #include "utilities.h"
 
diff --git a/src/SALOMELocalTrace/SALOME_Log.cxx b/src/SALOMELocalTrace/SALOME_Log.cxx
deleted file mode 100644
index be0041573..000000000
--- a/src/SALOMELocalTrace/SALOME_Log.cxx
+++ /dev/null
@@ -1,57 +0,0 @@
-//  SALOME_LocalTrace : log on local machine
-//
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-//
-//
-//
-//  File   : SALOME_Log.hxx
-//  Author : Vasily Rusyaev, Paul RASCLE, EDF
-//  Module : KERNEL
-//  $Header$
-
-#include <string>
-#include <iostream>
-
-#include "SALOME_Log.hxx"
-
-using namespace std;
-
-SALOME_Log::SALOME_Log()
-{
-}
-
-SALOME_Log::~SALOME_Log()
-{
-}
-
-SALOME_Log& SALOME_Log::Instance()
-{
-  static SALOME_Log instance;
-  return instance;
-}
-
-void SALOME_Log::putMessage(std::ostream& msg)
-{
-  cout << std::flush;
-  cerr <<str() << std::flush;
-  rdbuf()->freeze(false);
-  seekp(0);
-}
-
diff --git a/src/SALOMELocalTrace/SALOME_Log.hxx b/src/SALOMELocalTrace/SALOME_Log.hxx
deleted file mode 100644
index c92699457..000000000
--- a/src/SALOMELocalTrace/SALOME_Log.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-//  SALOME Utils : general SALOME's definitions and tools
-//
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-//
-//
-//
-//  File   : SALOME_Log.hxx
-//  Author : Vasily Rusyaev (OCN), Paul RASCLE (EDF)
-//  Module : KERNEL
-//  $Header$
-
-#ifndef _SALOME_LOG_HXX_
-#define _SALOME_LOG_HXX_
-
-#include <iostream>
-#include <strstream>
-
-//these declarations for files don't using OCC includes (for example HDF)
-# ifdef WNT
-
-#  ifndef Standard_EXPORT
-#   define Standard_EXPORT __declspec( dllexport )
-// For global variables :
-#   define Standard_EXPORTEXTERN __declspec( dllexport ) extern
-#   define Standard_EXPORTEXTERNC extern "C" __declspec( dllexport )
-#  endif  /* Standard_EXPORT */
-
-#  ifndef Standard_IMPORT
-#   define Standard_IMPORT __declspec( dllimport ) extern
-#   define Standard_IMPORTC extern "C" __declspec( dllimport )
-#  endif  /* Standard_IMPORT */
-
-# else  /* WNT */
-
-#  ifndef Standard_EXPORT
-#   define Standard_EXPORT
-// For global variables :
-#   define Standard_EXPORTEXTERN extern
-#   define Standard_EXPORTEXTERNC extern "C"
-#  endif  /* Standard_EXPORT */
-
-#  ifndef Standard_IMPORT
-#   define Standard_IMPORT extern
-#   define Standard_IMPORTC extern "C"
-#  endif  /* Standard_IMPORT */
-
-# endif  /* WNT */
-
-
-class SALOME_Log : public std::ostrstream
-{
-public:
-  virtual ~SALOME_Log();
-  static Standard_EXPORT SALOME_Log& Instance();
-  Standard_EXPORT void putMessage(std::ostream& msg);
-
-protected:
-  //disable creation of instances: force use static SALOME_Log& Instance()
-  SALOME_Log();
-};
-
-
-#define SLog SALOME_Log::Instance()
-
-#endif
diff --git a/src/Utils/utilities.h b/src/Utils/utilities.h
deleted file mode 100644
index 066e25d24..000000000
--- a/src/Utils/utilities.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//  SALOME Utils : general SALOME's definitions and tools
-//
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-//
-//
-//
-//  File   : utilities.h
-//  Author : Antoine YESSAYAN, Paul RASCLE, EDF
-//  Module : SALOME
-//  $Header$
-
-/* ---  Definition macros file to print informations if _DEBUG_ is defined --- */
-
-#ifndef UTILITIES_H
-#define UTILITIES_H
-
-#include <string>
-#include <iostream>
-#include "SALOME_Log.hxx"
-
-/* ---  INFOS is always defined (without _DEBUG_): to be used for warnings, with release version --- */
-
-#define INFOS(msg)    {SLog.putMessage(SLog<<__FILE__<<" ["<<__LINE__<<"] : "<<msg<<std::endl<<std::ends);}
-#define PYSCRIPT(msg) {SLog.putMessage(SLog<<"---PYSCRIPT--- "<<msg<<std::endl<<std::ends);}
-
-/* --- To print date and time of compilation of current source --- */
-
-#if defined ( __GNUC__ )
-#define COMPILER		"g++" 
-#elif defined ( __sun )
-#define COMPILER		"CC" 
-#elif defined ( __KCC )
-#define COMPILER		"KCC" 
-#elif defined ( __PGI )
-#define COMPILER		"pgCC" 
-#else
-#define COMPILER		"undefined" 
-#endif
-
-#ifdef INFOS_COMPILATION
-#error INFOS_COMPILATION already defined
-#endif
-
-#define INFOS_COMPILATION { \
-			   SLog.putMessage(\
-					   SLog<<__FILE__<<" ["<< __LINE__<<"] : "\
-					   << "COMPILED with " << COMPILER \
-					   << ", " << __DATE__ \
-					   << " at " << __TIME__ <<std::endl<<std::ends); }
-
-#ifdef _DEBUG_
-
-/* --- the following MACROS are useful at debug time --- */
-
-#define MYTRACE SLog<<"- Trace "<<__FILE__<<" ["<<__LINE__<<"] : " 
-
-#define MESSAGE(msg) {SLog.putMessage(MYTRACE<<msg<<std::endl<<std::ends);}
-#define SCRUTE(var)  {SLog.putMessage(MYTRACE<<#var<<"="<<var<<std::endl<<std::ends);}
-
-#define BEGIN_OF(msg) {SLog.putMessage(MYTRACE<<"Begin of: "<<msg<<"\n\n"<<std::ends);} 
-#define END_OF(msg)   {SLog.putMessage(SLog<<"\n"<<std::ends); \
-                       SLog.putMessage(MYTRACE<<"Normal end of: "<<msg<<"\n"<<std::ends);}
-
-#define HERE {std::cout<<std::flush ;std::cerr<<"- Trace "<<__FILE__<<" ["<<__LINE__<<"] : "<<std::flush;}
-
-#define INTERRUPTION(code) {HERE; \
-                            cerr<<"INTERRUPTION return code= "<<code<<std::endl; \
-                            std::exit(code);}
-
-#ifndef ASSERT
-#define ASSERT(condition) \
-        if(!(condition)){ \
-          HERE; \
-          std::cerr<<"CONDITION "<<#condition<<" NOT VERIFIED"<<std::endl; \
-          INTERRUPTION(1); \
-        }
-
-#endif /* ASSERT */
-
-
-#else /* ifdef _DEBUG_*/
-
-#define HERE 
-#define SCRUTE(var) {}
-#define MESSAGE(msg) {}
-#define BEGIN_OF(msg) {}
-#define END_OF(msg) {}
-
-#define INTERRUPTION(code) {}
-
-#ifndef ASSERT
-#define ASSERT(condition) {}
-#endif /* ASSERT */
-
-
-#endif /* ifdef _DEBUG_*/
-
-#endif /* ifndef UTILITIES_H */