Fix BOOST compilation problem on RedHat

diff --git a/src/DSC/DSC_User/Datastream/Calcium/CalciumCouplingPolicy.hxx b/src/DSC/DSC_User/Datastream/Calcium/CalciumCouplingPolicy.hxx
index e08fcd0ae2de7e028432624b16f203ad6252adb7..2165d35fec5ebdc36b961ea711ed5b8711e8f8b0 100644 (file)
--- 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 <boost/lambda/lambda.hpp>
 #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 2b8416bb37a49723870d1d5864f638e252f8eb53..741364614ed761a9760e171c137dfd7e91bf5808 100644 (file)
--- 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 f267a69b5a367c5ee0045f4570d6798bbd79cc64..e839642ba033bfb29116d89405e15322cbc18113 100644 (file)
--- 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 <boost/lambda/lambda.hpp>
 #include <vector>
 #include <algorithm>
 #include <iostream>

diff --git a/src/DSC/DSC_User/Datastream/Makefile.am b/src/DSC/DSC_User/Datastream/Makefile.am
index 28e048c0cdd9fe5488433d999490d4bb50475940..9ad8ba9c0865a7b6d7e97a8587cf9f5e77098c8d 100644 (file)
--- 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 7ea4dca889e2407c58d52a655a810dd79170f249..ec9ce2fbc1206ede89fbb79a55304a6e9cf40935 100644 (file)
--- 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 =