Fix for the bug IPAL22164: Fatal error during save/load a SMESH study

[modules/kernel.git] / src / SALOMEDSImpl / SALOMEDSImpl_Attributes.hxx

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Attributes.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Attributes.hxx
index ff366e78685ef9c06ad680bfc0fa7ac7e80272cb..e05ccf061b933189e4beffba90f179d51517ee59 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Attributes.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Attributes.hxx
@@ -1,38 +1,33 @@
-// Copyright (C) 2005  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.
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 //  File   : SALOMEDSImpl_Attributes.hxx
 //  Author : Sergey RUIN
 //  Module : SALOME
-
+//
 #ifndef __SALOMEDSIMPL_ATTRIBUTES__H__
 #define __SALOMEDSIMPL_ATTRIBUTES__H__
 
-#ifdef WNT
-# ifdef SALOMEDSIMPL_EXPORTS
-#  define SALOMEDSIMPL_EXPORT __declspec( dllexport )
-# else
-#  define SALOMEDSIMPL_EXPORT __declspec( dllimport )
-# endif
-#else
-# define SALOMEDSIMPL_EXPORT
-#endif
+#include "SALOMEDSImpl_Defines.hxx"
 
 #include <iostream>
 class SALOMEDSIMPL_EXPORT LockProtection
@@ -78,35 +73,35 @@ public :
 
 
 #define __AttributeTypeToGUIDForSObject \
-       if(theType == "AttributeReal") return SALOMEDSImpl_AttributeReal::GetID(); \
-       if(theType == "AttributeInteger") return SALOMEDSImpl_AttributeInteger::GetID(); \
-       if(theType == "AttributeSequenceOfReal") return SALOMEDSImpl_AttributeSequenceOfReal::GetID(); \
-       if(theType == "AttributeSequenceOfInteger") return SALOMEDSImpl_AttributeSequenceOfInteger::GetID(); \
-       if(theType == "AttributeName") return SALOMEDSImpl_AttributeName::GetID(); \
+        if(theType == "AttributeReal") return SALOMEDSImpl_AttributeReal::GetID(); \
+        if(theType == "AttributeInteger") return SALOMEDSImpl_AttributeInteger::GetID(); \
+        if(theType == "AttributeSequenceOfReal") return SALOMEDSImpl_AttributeSequenceOfReal::GetID(); \
+        if(theType == "AttributeSequenceOfInteger") return SALOMEDSImpl_AttributeSequenceOfInteger::GetID(); \
+        if(theType == "AttributeName") return SALOMEDSImpl_AttributeName::GetID(); \
         if(theType == "AttributeComment") return SALOMEDSImpl_AttributeComment::GetID(); \
         if(theType == "AttributeIOR") return SALOMEDSImpl_AttributeIOR::GetID(); \
         if(theType == "AttributePersistentRef") return SALOMEDSImpl_AttributePersistentRef::GetID(); \
         if(theType == "AttributeDrawable") return SALOMEDSImpl_AttributeDrawable::GetID(); \
         if(theType == "AttributeSelectable") return SALOMEDSImpl_AttributeSelectable::GetID(); \
-       if(theType == "AttributeExpandable") return SALOMEDSImpl_AttributeExpandable::GetID(); \
-       if(theType == "AttributeOpened") return SALOMEDSImpl_AttributeOpened::GetID(); \
-       if(theType == "AttributeTextColor") return SALOMEDSImpl_AttributeTextColor::GetID(); \
-       if(theType == "AttributeTextHighlightColor") return SALOMEDSImpl_AttributeTextHighlightColor::GetID(); \
-       if(theType == "AttributePixMap") return SALOMEDSImpl_AttributePixMap::GetID(); \
-       if(theType == "AttributeLocalID") return SALOMEDSImpl_AttributeLocalID::GetID(); \
-       if(theType == "AttributeTarget") return SALOMEDSImpl_AttributeTarget::GetID(); \
-       if(theType == "AttributeTableOfInteger") return SALOMEDSImpl_AttributeTableOfInteger::GetID(); \
-       if(theType == "AttributeTableOfReal") return SALOMEDSImpl_AttributeTableOfReal::GetID();  \
+        if(theType == "AttributeExpandable") return SALOMEDSImpl_AttributeExpandable::GetID(); \
+        if(theType == "AttributeOpened") return SALOMEDSImpl_AttributeOpened::GetID(); \
+        if(theType == "AttributeTextColor") return SALOMEDSImpl_AttributeTextColor::GetID(); \
+        if(theType == "AttributeTextHighlightColor") return SALOMEDSImpl_AttributeTextHighlightColor::GetID(); \
+        if(theType == "AttributePixMap") return SALOMEDSImpl_AttributePixMap::GetID(); \
+        if(theType == "AttributeLocalID") return SALOMEDSImpl_AttributeLocalID::GetID(); \
+        if(theType == "AttributeTarget") return SALOMEDSImpl_AttributeTarget::GetID(); \
+        if(theType == "AttributeTableOfInteger") return SALOMEDSImpl_AttributeTableOfInteger::GetID(); \
+        if(theType == "AttributeTableOfReal") return SALOMEDSImpl_AttributeTableOfReal::GetID();  \
         if(theType == "AttributeTableOfString") return SALOMEDSImpl_AttributeTableOfString::GetID(); \
-       if(theType == "AttributeStudyProperties") return SALOMEDSImpl_AttributeStudyProperties::GetID(); \
-       if(theType == "AttributePythonObject") return SALOMEDSImpl_AttributePythonObject::GetID(); \
-       if(theType == "AttributeUserID") return std::string("FFFFFFFF-D9CD-11d6-945D-1050DA506788"); \
-       if(theType == "AttributeExternalFileDef") return SALOMEDSImpl_AttributeExternalFileDef::GetID(); \
-       if(theType == "AttributeFileType") return SALOMEDSImpl_AttributeFileType::GetID(); \
-       if(theType == "AttributeFlags") return SALOMEDSImpl_AttributeFlags::GetID(); \
+        if(theType == "AttributeStudyProperties") return SALOMEDSImpl_AttributeStudyProperties::GetID(); \
+        if(theType == "AttributePythonObject") return SALOMEDSImpl_AttributePythonObject::GetID(); \
+        if(theType == "AttributeUserID") return std::string("FFFFFFFF-D9CD-11d6-945D-1050DA506788"); \
+        if(theType == "AttributeExternalFileDef") return SALOMEDSImpl_AttributeExternalFileDef::GetID(); \
+        if(theType == "AttributeFileType") return SALOMEDSImpl_AttributeFileType::GetID(); \
+        if(theType == "AttributeFlags") return SALOMEDSImpl_AttributeFlags::GetID(); \
         if(theType == "AttributeGraphic") return SALOMEDSImpl_AttributeGraphic::GetID(); \
-       if(theType == "AttributeReference") return SALOMEDSImpl_AttributeReference::GetID(); \
-       if(theType == "AttributeParameter") return SALOMEDSImpl_AttributeParameter::GetID(); \
+        if(theType == "AttributeReference") return SALOMEDSImpl_AttributeReference::GetID(); \
+        if(theType == "AttributeParameter") return SALOMEDSImpl_AttributeParameter::GetID(); \
         if(theType == "AttributeString") return SALOMEDSImpl_AttributeString::GetID();