[Simfqt-svn] SF.net SVN: simfqt:[30] trunk/simfqt

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

Revision: 30
          http://simfqt.svn.sourceforge.net/simfqt/?rev=30&view=rev
Author:   denis_arnaud
Date:     2010-12-03 16:50:21 +0000 (Fri, 03 Dec 2010)

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

Modified Paths:
--------------
    trunk/simfqt/simfqt/SIMFQT_Service.hpp
    trunk/simfqt/simfqt/batches/simfqt.cpp
    trunk/simfqt/simfqt/bom/FareRuleStruct.hpp
    trunk/simfqt/simfqt/command/FareParser.hpp
    trunk/simfqt/simfqt/command/FareRuleGenerator.cpp
    trunk/simfqt/simfqt/service/SIMFQT_ServiceContext.hpp
    trunk/simfqt/test/simfqt/FQTTestSuite.cpp

Modified: trunk/simfqt/simfqt/SIMFQT_Service.hpp
===================================================================
--- trunk/simfqt/simfqt/SIMFQT_Service.hpp	2010-12-02 15:46:37 UTC (rev 29)
+++ trunk/simfqt/simfqt/SIMFQT_Service.hpp	2010-12-03 16:50:21 UTC (rev 30)
@@ -5,7 +5,7 @@
 // Import section
 // //////////////////////////////////////////////////////////////////////
 // StdAir
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_basic_types.hpp>
 // SimFQT
 #include <simfqt/SIMFQT_Types.hpp>
 
@@ -16,7 +16,6 @@
   struct BasDBParams;
 }
 
-
 namespace SIMFQT {
 
   // Forward declaration
@@ -39,7 +38,7 @@
         @param const stdair::BasDBParams& Parameters for the database access.
         @param const stdair::Filename_T& Filename of the input fare file. */
     SIMFQT_Service (const stdair::BasLogParams&, const stdair::BasDBParams&,
-                      const stdair::Filename_T& iFareInputFilename);
+                    const stdair::Filename_T& iFareInputFilename);
 
     /** Constructor.
         <br>The init() method is called; see the corresponding documentation
@@ -50,7 +49,7 @@
         @param const stdair::Date_T& Date for the beginning of analysis.
         @param const stdair::Filename_T& Filename of the input fare file. */
     SIMFQT_Service (const stdair::BasLogParams&,
-                      const stdair::Filename_T& iFareInputFilename);
+                    const stdair::Filename_T& iFareInputFilename);
 
     /** Constructor.
         <br>The init() method is called; see the corresponding documentation

Modified: trunk/simfqt/simfqt/batches/simfqt.cpp
===================================================================
--- trunk/simfqt/simfqt/batches/simfqt.cpp	2010-12-02 15:46:37 UTC (rev 29)
+++ trunk/simfqt/simfqt/batches/simfqt.cpp	2010-12-03 16:50:21 UTC (rev 30)
@@ -12,7 +12,6 @@
 #include <boost/tokenizer.hpp>
 #include <boost/program_options.hpp>
 // StdAir
-#include <stdair/STDAIR_Types.hpp>
 #include <stdair/STDAIR_Service.hpp>
 #include <stdair/service/Logger.hpp>
 // Simfqt
@@ -175,7 +174,7 @@
 
 // /////////////// M A I N /////////////////
 int main (int argc, char* argv[]) {
-  try {
+
     // Query
     std::string lQuery;
     
@@ -207,6 +206,4 @@
     logOutputFile.close();
     
     return 0;
-    
-  } CATCH_ALL_EXCEPTIONS
 }

Modified: trunk/simfqt/simfqt/bom/FareRuleStruct.hpp
===================================================================
--- trunk/simfqt/simfqt/bom/FareRuleStruct.hpp	2010-12-02 15:46:37 UTC (rev 29)
+++ trunk/simfqt/simfqt/bom/FareRuleStruct.hpp	2010-12-03 16:50:21 UTC (rev 30)
@@ -7,8 +7,9 @@
 // STL
 #include <string>
 #include <vector>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_demand_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
 #include <stdair/basic/StructAbstract.hpp>
 #include <stdair/basic/BasParserTypes.hpp>
 // SIMFQT

Modified: trunk/simfqt/simfqt/command/FareParser.hpp
===================================================================
--- trunk/simfqt/simfqt/command/FareParser.hpp	2010-12-02 15:46:37 UTC (rev 29)
+++ trunk/simfqt/simfqt/command/FareParser.hpp	2010-12-03 16:50:21 UTC (rev 30)
@@ -7,7 +7,7 @@
 // STL
 #include <string>
 // StdAir
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_basic_types.hpp>
 #include <stdair/command/CmdAbstract.hpp>
 
 // Forward declarations.

Modified: trunk/simfqt/simfqt/command/FareRuleGenerator.cpp
===================================================================
--- trunk/simfqt/simfqt/command/FareRuleGenerator.cpp	2010-12-02 15:46:37 UTC (rev 29)
+++ trunk/simfqt/simfqt/command/FareRuleGenerator.cpp	2010-12-03 16:50:21 UTC (rev 30)
@@ -3,8 +3,7 @@
 // //////////////////////////////////////////////////////////////////////
 // STL
 #include <cassert>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
 #include <stdair/basic/BasConst_BookingClass.hpp>
 #include <stdair/basic/BasConst_Yield.hpp>
 #include <stdair/basic/BasConst_General.hpp>

Modified: trunk/simfqt/simfqt/service/SIMFQT_ServiceContext.hpp
===================================================================
--- trunk/simfqt/simfqt/service/SIMFQT_ServiceContext.hpp	2010-12-02 15:46:37 UTC (rev 29)
+++ trunk/simfqt/simfqt/service/SIMFQT_ServiceContext.hpp	2010-12-03 16:50:21 UTC (rev 30)
@@ -6,9 +6,9 @@
 // //////////////////////////////////////////////////////////////////////
 // STL
 #include <string>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
-// Simfqt
+// StdAir
+#include <stdair/stdair_service_types.hpp>
+// SimFQT
 #include <simfqt/SIMFQT_Types.hpp>
 #include <simfqt/service/ServiceAbstract.hpp>
 

Modified: trunk/simfqt/test/simfqt/FQTTestSuite.cpp
===================================================================
--- trunk/simfqt/test/simfqt/FQTTestSuite.cpp	2010-12-02 15:46:37 UTC (rev 29)
+++ trunk/simfqt/test/simfqt/FQTTestSuite.cpp	2010-12-03 16:50:21 UTC (rev 30)
@@ -5,8 +5,7 @@
 // CPPUNIT
 #include <extracppunit/CppUnitCore.hpp>
 // StdAir
-#include <stdair/basic/BasLogParams.hpp>
-#include <stdair/basic/BasDBParams.hpp>
+#include <stdair/STDAIR_Service.hpp>
 // SimFQT
 #include <simfqt/SIMFQT_Service.hpp>
 // SimFQT Test Suite


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