Menu
▾
▴
[Stdair-svn] SF.net SVN: stdair:[207] trunk/stdair/stdair
|
From: <den...@us...> - 2010-06-28 12:49:59
|
Revision: 207
http://stdair.svn.sourceforge.net/stdair/?rev=207&view=rev
Author: denis_arnaud
Date: 2010-06-28 12:49:47 +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/AirlineFeature.hpp
trunk/stdair/stdair/bom/AirportDate.hpp
trunk/stdair/stdair/bom/BomRoot.hpp
trunk/stdair/stdair/bom/BookingClass.hpp
trunk/stdair/stdair/bom/Bucket.hpp
trunk/stdair/stdair/bom/DemandStream.hpp
trunk/stdair/stdair/bom/FlightDate.hpp
trunk/stdair/stdair/bom/FlightPeriod.hpp
trunk/stdair/stdair/bom/Inventory.hpp
trunk/stdair/stdair/bom/LegCabin.hpp
trunk/stdair/stdair/bom/LegDate.hpp
trunk/stdair/stdair/bom/Network.hpp
trunk/stdair/stdair/bom/NetworkDate.hpp
trunk/stdair/stdair/bom/OriginDestinationSet.hpp
trunk/stdair/stdair/bom/OutboundPath.hpp
trunk/stdair/stdair/bom/ReachableUniverse.hpp
trunk/stdair/stdair/bom/SegmentCabin.hpp
trunk/stdair/stdair/bom/SegmentDate.hpp
trunk/stdair/stdair/bom/SegmentPathPeriod.hpp
trunk/stdair/stdair/bom/SegmentPeriod.hpp
trunk/stdair/stdair/bom/Structure.hpp
trunk/stdair/stdair/bom/YieldStore.hpp
trunk/stdair/stdair/factory/FacBomContent.hpp
trunk/stdair/stdair/factory/FacBomStructure.hpp
Modified: trunk/stdair/stdair/bom/AirlineFeature.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeature.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/AirlineFeature.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/AirportDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirportDate.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/AirportDate.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/BomRoot.hpp
===================================================================
--- trunk/stdair/stdair/bom/BomRoot.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/BomRoot.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/BookingClass.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClass.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/BookingClass.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/Bucket.hpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/Bucket.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/DemandStream.hpp
===================================================================
--- trunk/stdair/stdair/bom/DemandStream.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/DemandStream.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/FlightDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDate.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/FlightDate.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/FlightPeriod.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightPeriod.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/FlightPeriod.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/Inventory.hpp
===================================================================
--- trunk/stdair/stdair/bom/Inventory.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/Inventory.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/LegCabin.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabin.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/LegCabin.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/LegDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegDate.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/LegDate.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/Network.hpp
===================================================================
--- trunk/stdair/stdair/bom/Network.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/Network.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/NetworkDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/NetworkDate.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/NetworkDate.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/OriginDestinationSet.hpp
===================================================================
--- trunk/stdair/stdair/bom/OriginDestinationSet.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/OriginDestinationSet.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/OutboundPath.hpp
===================================================================
--- trunk/stdair/stdair/bom/OutboundPath.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/OutboundPath.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/ReachableUniverse.hpp
===================================================================
--- trunk/stdair/stdair/bom/ReachableUniverse.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/ReachableUniverse.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/SegmentCabin.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabin.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/SegmentCabin.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/SegmentDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDate.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/SegmentDate.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/SegmentPathPeriod.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentPathPeriod.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/SegmentPathPeriod.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/bom/SegmentPeriod.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentPeriod.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/SegmentPeriod.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -4,7 +4,14 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// Boost Fusion
+#include <boost/version.hpp>
+#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/SegmentPeriodContent.hpp>
#include <stdair/bom/SegmentPeriodTypes.hpp>
@@ -35,7 +42,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/Structure.hpp
===================================================================
--- trunk/stdair/stdair/bom/Structure.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/Structure.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -9,7 +9,6 @@
// Boost Fusion
#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
-//#include <boost/fusion/include/map.hpp>
#include <boost/fusion/include/at_key.hpp>
#endif // BOOST_VERSION >= 103500
// STDAIR
Modified: trunk/stdair/stdair/bom/YieldStore.hpp
===================================================================
--- trunk/stdair/stdair/bom/YieldStore.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/bom/YieldStore.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/map.hpp>
#else // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/factory/FacBomContent.hpp
===================================================================
--- trunk/stdair/stdair/factory/FacBomContent.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/factory/FacBomContent.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -7,6 +7,7 @@
// STL
#include <cassert>
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
#include <boost/fusion/include/at_key.hpp>
#endif // BOOST_VERSION >= 103500
Modified: trunk/stdair/stdair/factory/FacBomStructure.hpp
===================================================================
--- trunk/stdair/stdair/factory/FacBomStructure.hpp 2010-06-28 11:19:12 UTC (rev 206)
+++ trunk/stdair/stdair/factory/FacBomStructure.hpp 2010-06-28 12:49:47 UTC (rev 207)
@@ -8,11 +8,9 @@
#include <cassert>
#include <string>
#include <vector>
-//#include <iostream>
// Boost Fusion
+#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
-//#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.
|
