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

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

Revision: 382
          http://stdair.svn.sourceforge.net/stdair/?rev=382&view=rev
Author:   denis_arnaud
Date:     2010-12-03 14:51:47 +0000 (Fri, 03 Dec 2010)

Log Message:
-----------
[API] Fixed a few compilation errors with the new API.

Modified Paths:
--------------
    trunk/stdair/stdair/bom/Bucket.cpp
    trunk/stdair/stdair/bom/Bucket.hpp
    trunk/stdair/stdair/bom/BucketKey.hpp
    trunk/stdair/stdair/bom/OptimizerStruct.cpp
    trunk/stdair/stdair/bom/OptimizerStruct.hpp
    trunk/stdair/stdair/bom/TravelSolutionStruct.cpp
    trunk/stdair/stdair/bom/TravelSolutionStruct.hpp
    trunk/stdair/stdair/stdair_rm_types.hpp

Modified: trunk/stdair/stdair/bom/Bucket.cpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.cpp	2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/Bucket.cpp	2010-12-03 14:51:47 UTC (rev 382)
@@ -3,6 +3,7 @@
 // //////////////////////////////////////////////////////////////////////
 // STL
 #include <cassert>
+#include <sstream>
 // StdAir
 #include <stdair/bom/Bucket.hpp>
 

Modified: trunk/stdair/stdair/bom/Bucket.hpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.hpp	2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/Bucket.hpp	2010-12-03 14:51:47 UTC (rev 382)
@@ -4,8 +4,11 @@
 // //////////////////////////////////////////////////////////////////////
 // Import section
 // //////////////////////////////////////////////////////////////////////
-// STDAIR 
-#include <stdair/stdair_types.hpp>
+// STL
+#include <string>
+#include <iosfwd>
+// StdAir 
+#include <stdair/stdair_inventory_types.hpp>
 #include <stdair/bom/BomAbstract.hpp>
 #include <stdair/bom/BucketKey.hpp>
 #include <stdair/bom/BucketTypes.hpp>

Modified: trunk/stdair/stdair/bom/BucketKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BucketKey.hpp	2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/BucketKey.hpp	2010-12-03 14:51:47 UTC (rev 382)
@@ -4,7 +4,10 @@
 // //////////////////////////////////////////////////////////////////////
 // Import section
 // //////////////////////////////////////////////////////////////////////
-// STDAIR
+// STL
+#include <string>
+#include <iosfwd>
+// StdAir
 #include <stdair/bom/KeyAbstract.hpp>
 
 namespace stdair {

Modified: trunk/stdair/stdair/bom/OptimizerStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/OptimizerStruct.cpp	2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/OptimizerStruct.cpp	2010-12-03 14:51:47 UTC (rev 382)
@@ -2,11 +2,10 @@
 // Import section
 // //////////////////////////////////////////////////////////////////////
 // STL
-#include <string>
+#include <cassert>
 #include <sstream>
 #include <vector>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
 #include <stdair/bom/OptimizerStruct.hpp>
 
 namespace stdair {

Modified: trunk/stdair/stdair/bom/OptimizerStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/OptimizerStruct.hpp	2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/OptimizerStruct.hpp	2010-12-03 14:51:47 UTC (rev 382)
@@ -6,6 +6,8 @@
 // //////////////////////////////////////////////////////////////////////
 // STL
 #include <string>
+// StdAir
+#include <stdair/stdair_rm_types.hpp>
 
 namespace stdair {
 

Modified: trunk/stdair/stdair/bom/TravelSolutionStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/TravelSolutionStruct.cpp	2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/TravelSolutionStruct.cpp	2010-12-03 14:51:47 UTC (rev 382)
@@ -3,11 +3,8 @@
 // //////////////////////////////////////////////////////////////////////
 // STL
 #include <cassert>
-#include <istream>
-#include <ostream>
 #include <sstream>
 // StdAir
-#include <stdair/stdair_types.hpp>
 #include <stdair/basic/BasConst_BookingClass.hpp>
 #include <stdair/bom/TravelSolutionStruct.hpp>
 

Modified: trunk/stdair/stdair/bom/TravelSolutionStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/TravelSolutionStruct.hpp	2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/TravelSolutionStruct.hpp	2010-12-03 14:51:47 UTC (rev 382)
@@ -9,10 +9,12 @@
 #include <string>
 #include <vector>
 // StdAir
+#include <stdair/stdair_basic_types.hpp>
 #include <stdair/basic/StructAbstract.hpp>
 #include <stdair/bom/BookingClassTypes.hpp>
 
 namespace stdair {
+
   /** Structure holding the elements of a travel solution. */
   struct TravelSolutionStruct : public StructAbstract {
   public:

Modified: trunk/stdair/stdair/stdair_rm_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_rm_types.hpp	2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/stdair_rm_types.hpp	2010-12-03 14:51:47 UTC (rev 382)
@@ -7,6 +7,8 @@
 // STL
 #include <string>
 #include <vector>
+// StdAir
+#include <stdair/stdair_basic_types.hpp>
 
 namespace stdair {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.