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

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

Revision: 388
          http://stdair.svn.sourceforge.net/stdair/?rev=388&view=rev
Author:   denis_arnaud
Date:     2010-12-03 15:36:11 +0000 (Fri, 03 Dec 2010)

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

Modified Paths:
--------------
    trunk/stdair/stdair/command/DBManagerForAirlines.cpp
    trunk/stdair/stdair/command/DBManagerForAirlines.hpp
    trunk/stdair/stdair/sources.mk
    trunk/stdair/stdair/stdair_date_time_types.hpp
    trunk/stdair/stdair/stdair_types.hpp

Added Paths:
-----------
    trunk/stdair/stdair/stdair_service_types.hpp

Removed Paths:
-------------
    trunk/stdair/stdair/stdair_service.hpp

Modified: trunk/stdair/stdair/command/DBManagerForAirlines.cpp
===================================================================
--- trunk/stdair/stdair/command/DBManagerForAirlines.cpp	2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/command/DBManagerForAirlines.cpp	2010-12-03 15:36:11 UTC (rev 388)
@@ -12,7 +12,8 @@
 #include <mysql/soci-mysql.h>
 #endif // SOCI_HEADERS_BURIED
 // StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_exceptions.hpp>
 #include <stdair/bom/AirlineStruct.hpp>
 #include <stdair/dbadaptor/DbaAirline.hpp>
 #include <stdair/command/DBManagerForAirlines.hpp>

Modified: trunk/stdair/stdair/command/DBManagerForAirlines.hpp
===================================================================
--- trunk/stdair/stdair/command/DBManagerForAirlines.hpp	2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/command/DBManagerForAirlines.hpp	2010-12-03 15:36:11 UTC (rev 388)
@@ -5,6 +5,7 @@
 // Import section
 // //////////////////////////////////////////////////////////////////////
 // StdAir
+#include <stdair/stdair_db.hpp>
 #include <stdair/command/CmdAbstract.hpp>
 
 namespace stdair {

Modified: trunk/stdair/stdair/sources.mk
===================================================================
--- trunk/stdair/stdair/sources.mk	2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/sources.mk	2010-12-03 15:36:11 UTC (rev 388)
@@ -9,8 +9,8 @@
 	$(top_srcdir)/stdair/stdair_rm_types.hpp \
 	$(top_srcdir)/stdair/stdair_demand_types.hpp \
 	$(top_srcdir)/stdair/stdair_fare_types.hpp \
+	$(top_srcdir)/stdair/stdair_service_types.hpp \
 	$(top_srcdir)/stdair/stdair_types.hpp \
-	$(top_srcdir)/stdair/stdair_service.hpp \
 	$(top_srcdir)/stdair/STDAIR_Service.hpp
 stdair_service_cc_sources =
 

Modified: trunk/stdair/stdair/stdair_date_time_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_date_time_types.hpp	2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/stdair_date_time_types.hpp	2010-12-03 15:36:11 UTC (rev 388)
@@ -6,22 +6,9 @@
 // //////////////////////////////////////////////////////////////////////
 // STL
 #include <string>
-#include <vector>
-#include <map>
-// Boost Random
-#include <boost/random/linear_congruential.hpp>
-#include <boost/random/uniform_real.hpp>
-#include <boost/random/variate_generator.hpp>
 // Boost (Extended STL)
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/tuple/tuple.hpp>
-// StdAir
-#include <stdair/stdair_exceptions.hpp>
-#include <stdair/stdair_log.hpp>
-#include <stdair/stdair_db.hpp>
-#include <stdair/stdair_inventory_types.hpp>
-#include <stdair/stdair_service.hpp>
 
 namespace stdair {
 

Deleted: trunk/stdair/stdair/stdair_service.hpp
===================================================================
--- trunk/stdair/stdair/stdair_service.hpp	2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/stdair_service.hpp	2010-12-03 15:36:11 UTC (rev 388)
@@ -1,19 +0,0 @@
-#ifndef __STDAIR_STDAIR_SERVICE_HPP
-#define __STDAIR_STDAIR_SERVICE_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// Boost (Extended STL)
-#include <boost/shared_ptr.hpp>
-
-namespace stdair {
-
-  // Forward declarations
-  class STDAIR_Service;
-
-  /** Pointer on the STDAIR Service handler. */
-  typedef boost::shared_ptr<STDAIR_Service> STDAIR_ServicePtr_T;
-
-}
-#endif // __STDAIR_STDAIR_SERVICE_HPP

Copied: trunk/stdair/stdair/stdair_service_types.hpp (from rev 378, trunk/stdair/stdair/stdair_service.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_service_types.hpp	                        (rev 0)
+++ trunk/stdair/stdair/stdair_service_types.hpp	2010-12-03 15:36:11 UTC (rev 388)
@@ -0,0 +1,19 @@
+#ifndef __STDAIR_STDAIR_SERVICE_HPP
+#define __STDAIR_STDAIR_SERVICE_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// Boost (Extended STL)
+#include <boost/shared_ptr.hpp>
+
+namespace stdair {
+
+  // Forward declarations
+  class STDAIR_Service;
+
+  /** Pointer on the STDAIR Service handler. */
+  typedef boost::shared_ptr<STDAIR_Service> STDAIR_ServicePtr_T;
+
+}
+#endif // __STDAIR_STDAIR_SERVICE_HPP

Modified: trunk/stdair/stdair/stdair_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_types.hpp	2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/stdair_types.hpp	2010-12-03 15:36:11 UTC (rev 388)
@@ -15,6 +15,6 @@
 #include <stdair/stdair_inventory_types.hpp>
 #include <stdair/stdair_rm_types.hpp>
 #include <stdair/stdair_date_time_types.hpp>
-#include <stdair/stdair_service.hpp>
+#include <stdair/stdair_service_types.hpp>
 
 #endif // __STDAIR_STDAIR_TYPES_HPP


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