From: apo Date: Fri, 17 Feb 2006 08:24:52 +0000 (+0000) Subject: To use native BOOST libraries X-Git-Tag: mergeto_trunk_13Mar06~33 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d01d3a8569c6980cd7f88af17f6adae2d0a13a40;p=modules%2Fvisu.git To use native BOOST libraries --- diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index e38b5b7a..a143c7bb 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -37,8 +37,8 @@ CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ # BOOST Library BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@ BOOST_LIBS = @BOOST_LIBS@ -BOOST_LIBTHREAD = @BOOST_LIBTHREAD@ # JAVA diff --git a/src/CONVERTOR/Makefile.in b/src/CONVERTOR/Makefile.in index 9f3ea401..36847c34 100644 --- a/src/CONVERTOR/Makefile.in +++ b/src/CONVERTOR/Makefile.in @@ -64,7 +64,7 @@ CPPFLAGS+= -ftemplate-depth-32 $(VTK_INCLUDES) $(HDF5_INCLUDES) $(QT_INCLUDES) \ $(BOOST_CPPFLAGS) LDFLAGS+= $(VTK_LIBS) $(QT_LIBS) \ - $(BOOST_LIBS) -lboost_thread${BOOST_LIBTHREAD} \ + $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} \ -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper \ -L${GUI_ROOT_DIR}/lib/salome -lVTKViewer diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index 0499046f..0a5cbee8 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -33,6 +33,7 @@ VPATH=.:@srcdir@:@top_srcdir@/idl @COMMENCE@ EXPORT_HEADERS = \ + VISU_BoostSignals.h \ VISU_ActorFactory.h \ VISU_GaussPtsSettings.h \ VISU_GaussPtsActorFactory.h \ @@ -76,7 +77,7 @@ LDFLAGS+= \ -L${KERNEL_ROOT_DIR}/lib/salome LIBS+= \ - -lboost_signals${BOOST_LIBTHREAD} \ + -lboost_signals${BOOST_LIBSUFFIX} \ -lSalomeObject \ -lVisuPipeLine \ -lSVTK diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h index 96302c1e..09d4d4bb 100644 --- a/src/OBJECT/VISU_Actor.h +++ b/src/OBJECT/VISU_Actor.h @@ -31,11 +31,10 @@ #include "SALOME_Actor.h" #include "VISU_ActorFactory.h" +#include "VISU_BoostSignals.h" #include #include -#include -#include class vtkProp; class vtkProperty; @@ -60,7 +59,7 @@ namespace VISU //---------------------------------------------------------------------------- class VTKOCC_EXPORT VISU_Actor : public SALOME_Actor, - public boost::BOOST_SIGNALS_NAMESPACE::trackable + public boost::signalslib::trackable { public: vtkTypeMacro(VISU_Actor,SALOME_Actor); diff --git a/src/OBJECT/VISU_ActorFactory.h b/src/OBJECT/VISU_ActorFactory.h index 9a9bc12f..7395f1e1 100644 --- a/src/OBJECT/VISU_ActorFactory.h +++ b/src/OBJECT/VISU_ActorFactory.h @@ -29,7 +29,7 @@ #ifndef VISU_ACTOR_FACTORY_H #define VISU_ACTOR_FACTORY_H -#include +#include "VISU_BoostSignals.h" class VISU_Actor; @@ -46,7 +46,7 @@ namespace VISU This interface inherits from boost::bsignals::trackable in order to provide automatic diconnection from defined signals if the object is destroyed. */ - struct TActorFactory: public virtual boost::BOOST_SIGNALS_NAMESPACE::trackable + struct TActorFactory: public virtual boost::signalslib::trackable { //! Just to make this class virtual virtual diff --git a/src/OBJECT/VISU_BoostSignals.h b/src/OBJECT/VISU_BoostSignals.h new file mode 100644 index 00000000..9723e36b --- /dev/null +++ b/src/OBJECT/VISU_BoostSignals.h @@ -0,0 +1,56 @@ +// VISU OBJECT : interactive object for VISU entities implementation +// +// 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 : +// Author : +// Module : VISU +// $Header$ + +#ifndef VISU_BOOST_SIGNALS_H +#define VISU_BOOST_SIGNALS_H + +#ifdef signals +# ifndef QOBJECTDEFS_H +# error "Cannot recover the siganlas macro definition" +# else +# define EXTERNAL_SIGNALS_DEFINITION +# undef signals +# endif +#endif + +#include + +namespace boost { + namespace signalslib = BOOST_SIGNALS_NAMESPACE; +} + +#ifdef EXTERNAL_SIGNALS_DEFINITION +# undef EXTERNAL_SIGNALS_DEFINITION +# ifdef QT_MOC_CPP +# define signals signals +# else +# define signals protected +# endif +#endif + +#endif //VISU_BOOST_SIGNALS_H diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in index a8182da9..bc8b50a4 100644 --- a/src/VISU_I/Makefile.in +++ b/src/VISU_I/Makefile.in @@ -112,7 +112,7 @@ LDFLAGS += \ -L${GUI_ROOT_DIR}/lib/salome \ -L${MED_ROOT_DIR}/lib/salome -LIBS+= -lboost_signals${BOOST_LIBTHREAD} \ +LIBS+= -lboost_signals${BOOST_LIBSUFFIX} \ -lSalomeHDFPersist \ -lSalomeGenericObj \ -lSalomeContainer \ diff --git a/src/VISU_I/VISU_Prs3d_i.hh b/src/VISU_I/VISU_Prs3d_i.hh index efdd5556..c83955f5 100644 --- a/src/VISU_I/VISU_Prs3d_i.hh +++ b/src/VISU_I/VISU_Prs3d_i.hh @@ -35,7 +35,6 @@ #include "SALOME_GenericObj_i.hh" #include "SALOME_InteractiveObject.hxx" -#include #include class VISU_PipeLine; diff --git a/src/VISU_I/VISU_Result_i.hh b/src/VISU_I/VISU_Result_i.hh index 24fa919b..27ec5e08 100644 --- a/src/VISU_I/VISU_Result_i.hh +++ b/src/VISU_I/VISU_Result_i.hh @@ -28,11 +28,9 @@ #define __VISU_RESULT_I_H__ #include "VISUConfig.hh" +#include "VISU_BoostSignals.h" #include "SALOME_GenericObj_i.hh" -#include -#include - #include #include @@ -41,7 +39,7 @@ class VISU_Convertor; namespace VISU { //---------------------------------------------------------------------------- - class MinMaxCunsomer: public virtual boost::BOOST_SIGNALS_NAMESPACE::trackable + class MinMaxCunsomer: public virtual boost::signalslib::trackable { protected: bool myMinMaxIsInitilized;