From 0b066b2ae3030a6c6f2cb1de97f715ef44a45ccd Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 20 Apr 2007 07:19:54 +0000 Subject: [PATCH] Fix BOOST compilation problem on RedHat --- src/DSC/DSC_User/Datastream/Calcium/CalciumCouplingPolicy.hxx | 2 +- src/DSC/DSC_User/Datastream/Calcium/Makefile.am | 2 +- src/DSC/DSC_User/Datastream/Calcium/testInterpolation.cxx | 2 +- src/DSC/DSC_User/Datastream/Makefile.am | 2 +- src/DSC/DSC_User/Makefile.am | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/DSC/DSC_User/Datastream/Calcium/CalciumCouplingPolicy.hxx b/src/DSC/DSC_User/Datastream/Calcium/CalciumCouplingPolicy.hxx index e08fcd0ae..2165d35fe 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/CalciumCouplingPolicy.hxx +++ b/src/DSC/DSC_User/Datastream/Calcium/CalciumCouplingPolicy.hxx @@ -32,7 +32,7 @@ #include "DisplayPair.hxx" #include "CouplingPolicy.hxx" #include "AdjacentFunctor.hxx" -#include "lambda.hpp" +#include #include "CalciumTypes.hxx" #include "DSC_Exception.hxx" typedef DSC_Exception DATASTREAM_EXCEPTION; diff --git a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am index 2b8416bb3..741364614 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am +++ b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am @@ -71,7 +71,7 @@ COMMON_CPPFLAGS= -I$(top_srcdir)/src/DSC/DSC_User \ -I$(top_srcdir)/src/Utils \ -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ - @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @BOOST_CPPFLAGS@ # This local variable defines the list of dependant libraries common to all target in this package. COMMON_LIBS = @CORBA_LIBS@ diff --git a/src/DSC/DSC_User/Datastream/Calcium/testInterpolation.cxx b/src/DSC/DSC_User/Datastream/Calcium/testInterpolation.cxx index f267a69b5..e839642ba 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/testInterpolation.cxx +++ b/src/DSC/DSC_User/Datastream/Calcium/testInterpolation.cxx @@ -26,7 +26,7 @@ // Date : $LastChangedDate: 2007-01-08 19:01:14 +0100 (lun, 08 jan 2007) $ // Id : $Id$ -#include "lambda.hpp" +#include #include #include #include diff --git a/src/DSC/DSC_User/Datastream/Makefile.am b/src/DSC/DSC_User/Datastream/Makefile.am index 28e048c0c..9ad8ba9c0 100644 --- a/src/DSC/DSC_User/Datastream/Makefile.am +++ b/src/DSC/DSC_User/Datastream/Makefile.am @@ -53,7 +53,7 @@ salomeinclude_HEADERS = GenericPort.hxx \ # # This local variable defines the list of CPPFLAGS common to all target in this package. -COMMON_CPPFLAGS= -I$(top_srcdir)/src/DSC/DSC_User +COMMON_CPPFLAGS= @BOOST_CPPFLAGS@ -I$(top_srcdir)/src/DSC/DSC_User # This local variable defines the list of dependant libraries common to all target in this package. COMMON_LIBS = $(top_builddir)/src/DSC/DSC_User/Datastream/Palm/libSalomePalm.la \ diff --git a/src/DSC/DSC_User/Makefile.am b/src/DSC/DSC_User/Makefile.am index 7ea4dca88..ec9ce2fbc 100644 --- a/src/DSC/DSC_User/Makefile.am +++ b/src/DSC/DSC_User/Makefile.am @@ -58,7 +58,8 @@ COMMON_CPPFLAGS= -I$(srcdir)/Basic \ -I$(top_srcdir)/src/Utils \ -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ - @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @BOOST_CPPFLAGS@ + # This local variable defines the list of dependant libraries common to all target in this package. COMMON_LIBS = -- 2.39.2