From a888b7e01d4127a0da92243a9de3ec52c44fc75e Mon Sep 17 00:00:00 2001 From: jfa Date: Mon, 15 Aug 2011 11:38:40 +0000 Subject: [PATCH] Porting to OCCT6.5.1 --- src/CASCatch/CASCatch_OCCTVersion.hxx | 40 --------------------------- src/CASCatch/Makefile.am | 3 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 src/CASCatch/CASCatch_OCCTVersion.hxx diff --git a/src/CASCatch/CASCatch_OCCTVersion.hxx b/src/CASCatch/CASCatch_OCCTVersion.hxx deleted file mode 100644 index 45b02a0ef..000000000 --- a/src/CASCatch/CASCatch_OCCTVersion.hxx +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (C) 2007-2011 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 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 : CASCatch.hxx -// Author : Julia DOROVSKIKH, Open CASCADE S.A.S (julia.dorovskikh@opencascade.com) - -#ifndef CASCATCH_OCCTVERSION_HXX -#define CASCATCH_OCCTVERSION_HXX - -#include - -#ifdef OCC_VERSION_SERVICEPACK -# define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | OCC_VERSION_SERVICEPACK) -#else -# ifdef OCC_VERSION_DEVELOPMENT -# define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | 1) -# else -# define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8) -# endif -#endif - -#endif // CASCATCH_OCCTVERSION_HXX diff --git a/src/CASCatch/Makefile.am b/src/CASCatch/Makefile.am index f4b5321aa..bcd6a659c 100644 --- a/src/CASCatch/Makefile.am +++ b/src/CASCatch/Makefile.am @@ -28,8 +28,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am salomeinclude_HEADERS = CASCatch.hxx \ CASCatch_CatchSignals.hxx \ CASCatch_ErrorHandler.hxx \ - CASCatch_Failure.hxx \ - CASCatch_OCCTVersion.hxx + CASCatch_Failure.hxx lib_LTLIBRARIES = libCASCatch.la libCASCatch_la_SOURCES = \ -- 2.39.2