From: <den...@us...> - 2010-06-28 08:59:43
|
Revision: 201 http://stdair.svn.sourceforge.net/stdair/?rev=201&view=rev Author: denis_arnaud Date: 2010-06-28 08:59:37 +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/Network.hpp trunk/stdair/stdair/bom/YieldStore.hpp Modified: trunk/stdair/stdair/bom/Network.hpp =================================================================== --- trunk/stdair/stdair/bom/Network.hpp 2010-06-28 08:53:24 UTC (rev 200) +++ trunk/stdair/stdair/bom/Network.hpp 2010-06-28 08:59:37 UTC (rev 201) @@ -4,7 +4,13 @@ // ////////////////////////////////////////////////////////////////////// // Import section // ////////////////////////////////////////////////////////////////////// -// STDAIR +// Boost Fusion +#if BOOST_VERSION >= 103500 +#include <boost/fusion/include/map.hpp> +#else // BOOST_VERSION >= 103500 +#include <boost/mpl/map.hpp> +#endif // BOOST_VERSION >= 103500 +// StdAir #include <stdair/bom/NetworkContent.hpp> #include <stdair/bom/NetworkTypes.hpp> #include <stdair/bom/NetworkDateTypes.hpp> @@ -36,9 +42,13 @@ typedef std::map<const MapKey_T, const Structure_T*> Map_T; /** Define the list of children holder types. */ +#if BOOST_VERSION >= 103500 typedef boost::fusion::map< boost::fusion::pair<NetworkDate, NetworkDateHolder_T*> > ChildrenHolderMap_T; +#else // BOOST_VERSION >= 103500 + typedef boost::mpl::map< > ChildrenHolderMap_T; +#endif // BOOST_VERSION >= 103500 // ////////////////////////////////////////////////////////////////// public: Modified: trunk/stdair/stdair/bom/YieldStore.hpp =================================================================== --- trunk/stdair/stdair/bom/YieldStore.hpp 2010-06-28 08:53:24 UTC (rev 200) +++ trunk/stdair/stdair/bom/YieldStore.hpp 2010-06-28 08:59:37 UTC (rev 201) @@ -4,7 +4,13 @@ // ////////////////////////////////////////////////////////////////////// // Import section // ////////////////////////////////////////////////////////////////////// -// STDAIR +// Boost Fusion +#if BOOST_VERSION >= 103500 +#include <boost/fusion/include/map.hpp> +#else // BOOST_VERSION >= 103500 +#include <boost/mpl/map.hpp> +#endif // BOOST_VERSION >= 103500 +// StdAir #include <stdair/bom/YieldStoreContent.hpp> #include <stdair/bom/YieldStoreTypes.hpp> @@ -34,7 +40,11 @@ typedef std::map<const MapKey_T, const Structure_T*> Map_T; /** Define the list of children holder types. */ +#if BOOST_VERSION >= 103500 typedef boost::fusion::map< > ChildrenHolderMap_T; +#else // BOOST_VERSION >= 103500 + typedef boost::mpl::map< > ChildrenHolderMap_T; +#endif // BOOST_VERSION >= 103500 // ////////////////////////////////////////////////////////////////// public: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |