Merge from V6_main_20120808 08Aug12

[modules/kernel.git] / src / DSC / DSC_User / Datastream / Calcium / CalciumException.hxx

diff --git a/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx b/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx
index 4587f71bb540261639169838e9b7073bc716724a..64654e6205604be1531273a70796c4c7fdc8c5e4 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx
@@ -1,24 +1,22 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// 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.
+// 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
 //
+
 //  File   : CalciumException.hxx
 //  Author : Eric Fayolle (EDF)
 //  Module : KERNEL
@@ -29,6 +27,10 @@
 #ifndef CALCIUM_EXCEPTION_HXX
 #define CALCIUM_EXCEPTION_HXX
 
+#if defined(__CONST_H) || defined(__CALCIUM_H)
+#error "The header CalciumException.hxx must be included before calcium.h"
+#endif
+
 #include "DSC_Exception.hxx"
 #include "CalciumTypes.hxx"
 #include <string>
@@ -36,17 +38,17 @@
 struct CalciumException  : public DSC_Exception {
 
   CalciumException( const CalciumTypes::InfoType info,
-                   const std::string &     text, 
-                   const char        *fileName, 
-                   const unsigned int lineNumber,
-                   const char        *funcName):
+                    const std::string &     text, 
+                    const char        *fileName, 
+                    const unsigned int lineNumber,
+                    const char        *funcName):
     DSC_Exception(text,fileName,lineNumber,funcName),
     _info(info),_exceptionName("CalciumException")
   {};
 
 
   CalciumException( const CalciumTypes::InfoType info,
-                      const std::string & text ):
+                       const std::string & text ):
     DSC_Exception(text),_info(info),_exceptionName("CalciumException")
   {};