[Stdair-svn] SF.net SVN: stdair:[204] trunk/stdair/stdair/bom

[<den...@us...>]

Revision: 204
          http://stdair.svn.sourceforge.net/stdair/?rev=204&view=rev
Author:   denis_arnaud
Date:     2010-06-28 10:35:53 +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/AirportDate.hpp
    trunk/stdair/stdair/bom/FlightDate.hpp
    trunk/stdair/stdair/bom/NetworkDate.hpp
    trunk/stdair/stdair/bom/OriginDestinationSet.hpp
    trunk/stdair/stdair/bom/ReachableUniverse.hpp
    trunk/stdair/stdair/bom/SegmentPathPeriod.hpp

Modified: trunk/stdair/stdair/bom/AirportDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirportDate.hpp	2010-06-28 09:28:02 UTC (rev 203)
+++ trunk/stdair/stdair/bom/AirportDate.hpp	2010-06-28 10:35:53 UTC (rev 204)
@@ -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/AirportDateContent.hpp>
 #include <stdair/bom/AirportDateTypes.hpp>
 #include <stdair/bom/OutboundPathTypes.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<OutboundPath, OutboundPathHolder_T*>
       > ChildrenHolderMap_T;
+#else // BOOST_VERSION >= 103500
+    typedef boost::mpl::map< > ChildrenHolderMap_T;
+#endif // BOOST_VERSION >= 103500
     // //////////////////////////////////////////////////////////////////
     
   public:

Modified: trunk/stdair/stdair/bom/FlightDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDate.hpp	2010-06-28 09:28:02 UTC (rev 203)
+++ trunk/stdair/stdair/bom/FlightDate.hpp	2010-06-28 10:35:53 UTC (rev 204)
@@ -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/FlightDateContent.hpp>
 #include <stdair/bom/FlightDateTypes.hpp>
 #include <stdair/bom/SegmentDateTypes.hpp>
@@ -40,10 +46,14 @@
     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<LegDate, LegDateHolder_T*>,
       boost::fusion::pair<SegmentDate, SegmentDateHolder_T*>
       > ChildrenHolderMap_T;
+#else // BOOST_VERSION >= 103500
+    typedef boost::mpl::map< > ChildrenHolderMap_T;
+#endif // BOOST_VERSION >= 103500
     // //////////////////////////////////////////////////////////////////
 
   public:

Modified: trunk/stdair/stdair/bom/NetworkDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/NetworkDate.hpp	2010-06-28 09:28:02 UTC (rev 203)
+++ trunk/stdair/stdair/bom/NetworkDate.hpp	2010-06-28 10:35:53 UTC (rev 204)
@@ -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/NetworkDateContent.hpp>
 #include <stdair/bom/NetworkDateTypes.hpp>
 #include <stdair/bom/AirportDateTypes.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<AirportDate, AirportDateHolder_T*>
       > ChildrenHolderMap_T;
+#else // BOOST_VERSION >= 103500
+    typedef boost::mpl::map< > ChildrenHolderMap_T;
+#endif // BOOST_VERSION >= 103500
     // //////////////////////////////////////////////////////////////////
 
   public:

Modified: trunk/stdair/stdair/bom/OriginDestinationSet.hpp
===================================================================
--- trunk/stdair/stdair/bom/OriginDestinationSet.hpp	2010-06-28 09:28:02 UTC (rev 203)
+++ trunk/stdair/stdair/bom/OriginDestinationSet.hpp	2010-06-28 10:35:53 UTC (rev 204)
@@ -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/OriginDestinationSetContent.hpp>
 #include <stdair/bom/OriginDestinationSetTypes.hpp>
 #include <stdair/bom/SegmentPathPeriodTypes.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<SegmentPathPeriod, SegmentPathPeriodHolder_T*>
       > ChildrenHolderMap_T;
+#else // BOOST_VERSION >= 103500
+    typedef boost::mpl::map< > ChildrenHolderMap_T;
+#endif // BOOST_VERSION >= 103500
     // //////////////////////////////////////////////////////////////////
 
   public:

Modified: trunk/stdair/stdair/bom/ReachableUniverse.hpp
===================================================================
--- trunk/stdair/stdair/bom/ReachableUniverse.hpp	2010-06-28 09:28:02 UTC (rev 203)
+++ trunk/stdair/stdair/bom/ReachableUniverse.hpp	2010-06-28 10:35:53 UTC (rev 204)
@@ -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/ReachableUniverseContent.hpp>
 #include <stdair/bom/ReachableUniverseTypes.hpp>
 #include <stdair/bom/SegmentPathPeriodTypes.hpp>
@@ -38,9 +44,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<OriginDestinationSet, OriginDestinationSetHolder_T*>
       > ChildrenHolderMap_T;
+#else // BOOST_VERSION >= 103500
+    typedef boost::mpl::map< > ChildrenHolderMap_T;
+#endif // BOOST_VERSION >= 103500
     // //////////////////////////////////////////////////////////////////
     
   public:

Modified: trunk/stdair/stdair/bom/SegmentPathPeriod.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentPathPeriod.hpp	2010-06-28 09:28:02 UTC (rev 203)
+++ trunk/stdair/stdair/bom/SegmentPathPeriod.hpp	2010-06-28 10:35:53 UTC (rev 204)
@@ -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/SegmentPathPeriodContent.hpp>
 #include <stdair/bom/SegmentPathPeriodTypes.hpp>
 #include <stdair/bom/SegmentPeriodTypes.hpp>
@@ -36,9 +42,13 @@
     typedef std::multimap<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<SegmentPeriod, SegmentPeriodHolder_T*>
       > 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.