From aee2cffd4d1758842e2789e64fe57f2f0ae92c1c Mon Sep 17 00:00:00 2001 From: apo Date: Thu, 16 Feb 2006 07:27:12 +0000 Subject: [PATCH] To avoid conflicts between boost::signals and Qt signals MOC keyword --- src/OBJECT/VISU_Actor.h | 2 +- src/OBJECT/VISU_ActorFactory.h | 2 +- src/VISU_I/VISU_Result_i.hh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h index ffeab72e..96302c1e 100644 --- a/src/OBJECT/VISU_Actor.h +++ b/src/OBJECT/VISU_Actor.h @@ -60,7 +60,7 @@ namespace VISU //---------------------------------------------------------------------------- class VTKOCC_EXPORT VISU_Actor : public SALOME_Actor, - public boost::bsignals::trackable + public boost::BOOST_SIGNALS_NAMESPACE::trackable { public: vtkTypeMacro(VISU_Actor,SALOME_Actor); diff --git a/src/OBJECT/VISU_ActorFactory.h b/src/OBJECT/VISU_ActorFactory.h index 97cee603..9a9bc12f 100644 --- a/src/OBJECT/VISU_ActorFactory.h +++ b/src/OBJECT/VISU_ActorFactory.h @@ -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::bsignals::trackable + struct TActorFactory: public virtual boost::BOOST_SIGNALS_NAMESPACE::trackable { //! Just to make this class virtual virtual diff --git a/src/VISU_I/VISU_Result_i.hh b/src/VISU_I/VISU_Result_i.hh index fec23981..24fa919b 100644 --- a/src/VISU_I/VISU_Result_i.hh +++ b/src/VISU_I/VISU_Result_i.hh @@ -41,7 +41,7 @@ class VISU_Convertor; namespace VISU { //---------------------------------------------------------------------------- - class MinMaxCunsomer: public virtual boost::bsignals::trackable + class MinMaxCunsomer: public virtual boost::BOOST_SIGNALS_NAMESPACE::trackable { protected: bool myMinMaxIsInitilized; -- 2.39.2