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

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

Revision: 203
          http://stdair.svn.sourceforge.net/stdair/?rev=203&view=rev
Author:   denis_arnaud
Date:     2010-06-28 09:28:02 +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/BookingClass.hpp
    trunk/stdair/stdair/bom/Bucket.hpp
    trunk/stdair/stdair/bom/DemandStream.hpp
    trunk/stdair/stdair/bom/FlightPeriod.hpp
    trunk/stdair/stdair/bom/LegCabin.hpp
    trunk/stdair/stdair/bom/LegDate.hpp
    trunk/stdair/stdair/bom/SegmentCabin.hpp
    trunk/stdair/stdair/bom/SegmentDate.hpp

Modified: trunk/stdair/stdair/bom/BookingClass.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClass.hpp	2010-06-28 09:16:58 UTC (rev 202)
+++ trunk/stdair/stdair/bom/BookingClass.hpp	2010-06-28 09:28:02 UTC (rev 203)
@@ -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/BookingClassContent.hpp>
 #include <stdair/bom/BookingClassTypes.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
     // //////////////////////////////////////////////////////////////////
 
     // /////////////// Getters ////////////////

Modified: trunk/stdair/stdair/bom/Bucket.hpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.hpp	2010-06-28 09:16:58 UTC (rev 202)
+++ trunk/stdair/stdair/bom/Bucket.hpp	2010-06-28 09:28:02 UTC (rev 203)
@@ -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/BucketContent.hpp>
 #include <stdair/bom/BucketTypes.hpp>
 
@@ -33,7 +39,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:

Modified: trunk/stdair/stdair/bom/DemandStream.hpp
===================================================================
--- trunk/stdair/stdair/bom/DemandStream.hpp	2010-06-28 09:16:58 UTC (rev 202)
+++ trunk/stdair/stdair/bom/DemandStream.hpp	2010-06-28 09:28:02 UTC (rev 203)
@@ -5,7 +5,11 @@
 // Import section
 // //////////////////////////////////////////////////////////////////////
 // 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/DemandStreamContent.hpp>
 #include <stdair/bom/DemandStreamTypes.hpp>
@@ -35,7 +39,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:

Modified: trunk/stdair/stdair/bom/FlightPeriod.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightPeriod.hpp	2010-06-28 09:16:58 UTC (rev 202)
+++ trunk/stdair/stdair/bom/FlightPeriod.hpp	2010-06-28 09:28:02 UTC (rev 203)
@@ -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/FlightPeriodContent.hpp>
 #include <stdair/bom/FlightPeriodTypes.hpp>
 #include <stdair/bom/SegmentPeriodTypes.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<SegmentPeriod, SegmentPeriodHolder_T*>
       > ChildrenHolderMap_T;
+#else // BOOST_VERSION >= 103500
+    typedef boost::mpl::map< > ChildrenHolderMap_T;
+#endif // BOOST_VERSION >= 103500
     // //////////////////////////////////////////////////////////////////
 
   public:

Modified: trunk/stdair/stdair/bom/LegCabin.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabin.hpp	2010-06-28 09:16:58 UTC (rev 202)
+++ trunk/stdair/stdair/bom/LegCabin.hpp	2010-06-28 09:28:02 UTC (rev 203)
@@ -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/LegCabinContent.hpp>
 #include <stdair/bom/LegCabinTypes.hpp>
 #include <stdair/bom/BucketTypes.hpp>
@@ -38,10 +44,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<Bucket, BucketHolder_T*>,
       boost::fusion::pair<SegmentCabin, SegmentCabinHolder_T*>
       > ChildrenHolderMap_T;
+#else // BOOST_VERSION >= 103500
+    typedef boost::mpl::map< > ChildrenHolderMap_T;
+#endif // BOOST_VERSION >= 103500
     // //////////////////////////////////////////////////////////////////
 
   public:

Modified: trunk/stdair/stdair/bom/LegDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegDate.hpp	2010-06-28 09:16:58 UTC (rev 202)
+++ trunk/stdair/stdair/bom/LegDate.hpp	2010-06-28 09:28:02 UTC (rev 203)
@@ -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/LegDateContent.hpp>
 #include <stdair/bom/LegDateTypes.hpp>
 #include <stdair/bom/LegCabinTypes.hpp>
@@ -38,10 +44,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<LegCabin, LegCabinHolder_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/SegmentCabin.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabin.hpp	2010-06-28 09:16:58 UTC (rev 202)
+++ trunk/stdair/stdair/bom/SegmentCabin.hpp	2010-06-28 09:28:02 UTC (rev 203)
@@ -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/SegmentCabinContent.hpp>
 #include <stdair/bom/SegmentCabinTypes.hpp>
 #include <stdair/bom/BookingClassTypes.hpp>
@@ -38,10 +44,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<BookingClass, BookingClassHolder_T*>,
       boost::fusion::pair<LegCabin, LegCabinHolder_T*>
       > ChildrenHolderMap_T;
+#else // BOOST_VERSION >= 103500
+    typedef boost::mpl::map< > ChildrenHolderMap_T;
+#endif // BOOST_VERSION >= 103500
     // //////////////////////////////////////////////////////////////////
    
   public:

Modified: trunk/stdair/stdair/bom/SegmentDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDate.hpp	2010-06-28 09:16:58 UTC (rev 202)
+++ trunk/stdair/stdair/bom/SegmentDate.hpp	2010-06-28 09:28:02 UTC (rev 203)
@@ -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/SegmentDateContent.hpp>
 #include <stdair/bom/SegmentDateTypes.hpp>
 #include <stdair/bom/LegDateTypes.hpp>
@@ -38,10 +44,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<SegmentCabin, SegmentCabinHolder_T*>,
       boost::fusion::pair<LegDate, LegDateHolder_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.