From: <den...@us...> - 2010-06-28 11:19:18
|
Revision: 206 http://stdair.svn.sourceforge.net/stdair/?rev=206&view=rev Author: denis_arnaud Date: 2010-06-28 11:19:12 +0000 (Mon, 28 Jun 2010) Log Message: ----------- [Dev] Added pragma directives to support Boost versions lower than 1.35 (e.g., for RedHat/CentOS 5). Modified Paths: -------------- trunk/stdair/stdair/bom/Structure.hpp trunk/stdair/stdair/factory/FacBomContent.hpp trunk/stdair/stdair/factory/FacBomStructure.hpp Modified: trunk/stdair/stdair/bom/Structure.hpp =================================================================== --- trunk/stdair/stdair/bom/Structure.hpp 2010-06-28 11:05:45 UTC (rev 205) +++ trunk/stdair/stdair/bom/Structure.hpp 2010-06-28 11:19:12 UTC (rev 206) @@ -9,7 +9,7 @@ // Boost Fusion #include <boost/version.hpp> #if BOOST_VERSION >= 103500 -#include <boost/fusion/include/map.hpp> +//#include <boost/fusion/include/map.hpp> #include <boost/fusion/include/at_key.hpp> #endif // BOOST_VERSION >= 103500 // STDAIR Modified: trunk/stdair/stdair/factory/FacBomContent.hpp =================================================================== --- trunk/stdair/stdair/factory/FacBomContent.hpp 2010-06-28 11:05:45 UTC (rev 205) +++ trunk/stdair/stdair/factory/FacBomContent.hpp 2010-06-28 11:19:12 UTC (rev 206) @@ -5,8 +5,12 @@ // Import section // ////////////////////////////////////////////////////////////////////// // STL -#include <map> -// STDAIR +#include <cassert> +// Boost Fusion +#if BOOST_VERSION >= 103500 +#include <boost/fusion/include/at_key.hpp> +#endif // BOOST_VERSION >= 103500 +// StdAir #include <stdair/STDAIR_Types.hpp> #include <stdair/basic/BasConst_Inventory.hpp> #include <stdair/basic/DemandCharacteristicTypes.hpp> Modified: trunk/stdair/stdair/factory/FacBomStructure.hpp =================================================================== --- trunk/stdair/stdair/factory/FacBomStructure.hpp 2010-06-28 11:05:45 UTC (rev 205) +++ trunk/stdair/stdair/factory/FacBomStructure.hpp 2010-06-28 11:19:12 UTC (rev 206) @@ -8,11 +8,11 @@ #include <cassert> #include <string> #include <vector> -#include <iostream> +//#include <iostream> // Boost Fusion #if BOOST_VERSION >= 103500 -#include <boost/fusion/container/map.hpp> -#include <boost/fusion/include/map.hpp> +//#include <boost/fusion/container/map.hpp> +//#include <boost/fusion/include/map.hpp> #include <boost/fusion/include/at_key.hpp> #else // BOOST_VERSION >= 103500 #include <boost/mpl/map.hpp> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |