Merge branch 'eap/23514'

[modules/kernel.git] / src / SALOMELocalTrace / utilities.h

diff --git a/src/SALOMELocalTrace/utilities.h b/src/SALOMELocalTrace/utilities.h
index 80255a9e20d4be8db3c8552ae253ac2107cd3e20..dbfa0d34b6626073ad94eff44caa951273e1d3d8 100644 (file)
--- a/src/SALOMELocalTrace/utilities.h
+++ b/src/SALOMELocalTrace/utilities.h
@@ -1,31 +1,32 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  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 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, or (at your option) any later version.
 //
-//  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.
+// 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
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME Utils : general SALOME's definitions and tools
 //  File   : utilities.h
 //  Author : Antoine YESSAYAN, Paul RASCLE, EDF
 //  Module : SALOME
 //  $Header$
 //
-/* ---  Definition macros file to print informations if _DEBUG_ is defined --- */
+/* ---  Definition macros file to print information if _DEBUG_ is defined --- */
 
 #ifndef UTILITIES_H
 #define UTILITIES_H
@@ -46,7 +47,7 @@
  * This buffer is read later by a specific thread in charge of trace print.
  * Order of trace entries is globally respected. Nevertheless, if there are
  * several threads waiting for a free buffer to trace, the order of
- * thread waken up is not garanteed (no fifo or priority rules in Linux Kernel)
+ * thread waken up is not guaranteed (no fifo or priority rules in Linux Kernel)
  */
 
 #define MESS_INIT(deb) std::ostringstream os; os<<deb
@@ -67,12 +68,12 @@
 
 #ifdef WIN32
 #define IMMEDIATE_ABORT(code) {std::cout <<std::flush; \
-                               std::cerr << "- ABORT " << __FILE__ << " [" <<__LINE__<< "] : " << flush; \
+                               std::cerr << "- ABORT " << __FILE__ << " [" <<__LINE__<< "] : " << std::flush; \
                                std::cerr << "ABORT return code= "<< code << std::endl; \
                                /*std::*/exit(code);}
 #else
 #define IMMEDIATE_ABORT(code) {std::cout <<std::flush; \
-                               std::cerr << "- ABORT " << __FILE__ << " [" <<__LINE__<< "] : " << flush; \
+                               std::cerr << "- ABORT " << __FILE__ << " [" <<__LINE__<< "] : " << std::flush; \
                                std::cerr << "ABORT return code= "<< code << std::endl; \
                                std::exit(code);}
 #endif
@@ -80,17 +81,17 @@
 /* --- To print date and time of compilation of current source --- */
 
 #if defined ( __GNUC__ )
-#define COMPILER               "g++" 
+#define COMPILER                "g++" 
 #elif defined ( __sun )
-#define COMPILER               "CC" 
+#define COMPILER                "CC" 
 #elif defined ( __KCC )
-#define COMPILER               "KCC" 
+#define COMPILER                "KCC" 
 #elif defined ( __PGI )
-#define COMPILER               "pgCC" 
+#define COMPILER                "pgCC" 
 #elif defined ( __alpha )
-#define COMPILER               "cxx" 
+#define COMPILER                "cxx" 
 #else
-#define COMPILER               "undefined" 
+#define COMPILER                "undefined" 
 #endif
 
 #ifdef INFOS_COMPILATION
@@ -102,8 +103,8 @@
 // --- the following MACROS are useful at debug time
 
 #define INFOS_COMPILATION { MESS_BEGIN("COMPILED with ") << COMPILER \
-                                      << ", " << __DATE__ \
-                                      << " at " << __TIME__ << MESS_END }
+                                       << ", " << __DATE__ \
+                                       << " at " << __TIME__ << MESS_END }
 
 #define MESSAGE(msg) {MESS_BEGIN("- Trace ") << msg << MESS_END}
 #define SCRUTE(var)  {MESS_BEGIN("- Trace ") << #var << "=" << var <<MESS_END}