From: <den...@us...> - 2010-12-03 17:22:57
|
Revision: 387 http://stdair.svn.sourceforge.net/stdair/?rev=387&view=rev Author: denis_arnaud Date: 2010-12-03 15:33:52 +0000 (Fri, 03 Dec 2010) Log Message: ----------- [Branch 0.9.0][API] Fixed a few compilation errors with the new API. Modified Paths: -------------- branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.cpp branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.hpp branches/stdair/0.9.0/main/stdair/sources.mk branches/stdair/0.9.0/main/stdair/stdair_date_time_types.hpp branches/stdair/0.9.0/main/stdair/stdair_types.hpp Added Paths: ----------- branches/stdair/0.9.0/main/stdair/stdair_service_types.hpp Removed Paths: ------------- branches/stdair/0.9.0/main/stdair/stdair_service.hpp Modified: branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.cpp =================================================================== --- branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.cpp 2010-12-03 15:20:52 UTC (rev 386) +++ branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.cpp 2010-12-03 15:33:52 UTC (rev 387) @@ -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: branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.hpp =================================================================== --- branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.hpp 2010-12-03 15:20:52 UTC (rev 386) +++ branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.hpp 2010-12-03 15:33:52 UTC (rev 387) @@ -5,6 +5,7 @@ // Import section // ////////////////////////////////////////////////////////////////////// // StdAir +#include <stdair/stdair_db.hpp> #include <stdair/command/CmdAbstract.hpp> namespace stdair { Modified: branches/stdair/0.9.0/main/stdair/sources.mk =================================================================== --- branches/stdair/0.9.0/main/stdair/sources.mk 2010-12-03 15:20:52 UTC (rev 386) +++ branches/stdair/0.9.0/main/stdair/sources.mk 2010-12-03 15:33:52 UTC (rev 387) @@ -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: branches/stdair/0.9.0/main/stdair/stdair_date_time_types.hpp =================================================================== --- branches/stdair/0.9.0/main/stdair/stdair_date_time_types.hpp 2010-12-03 15:20:52 UTC (rev 386) +++ branches/stdair/0.9.0/main/stdair/stdair_date_time_types.hpp 2010-12-03 15:33:52 UTC (rev 387) @@ -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: branches/stdair/0.9.0/main/stdair/stdair_service.hpp =================================================================== --- branches/stdair/0.9.0/main/stdair/stdair_service.hpp 2010-12-03 15:20:52 UTC (rev 386) +++ branches/stdair/0.9.0/main/stdair/stdair_service.hpp 2010-12-03 15:33:52 UTC (rev 387) @@ -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: branches/stdair/0.9.0/main/stdair/stdair_service_types.hpp (from rev 376, branches/stdair/0.9.0/main/stdair/stdair_service.hpp) =================================================================== --- branches/stdair/0.9.0/main/stdair/stdair_service_types.hpp (rev 0) +++ branches/stdair/0.9.0/main/stdair/stdair_service_types.hpp 2010-12-03 15:33:52 UTC (rev 387) @@ -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: branches/stdair/0.9.0/main/stdair/stdair_types.hpp =================================================================== --- branches/stdair/0.9.0/main/stdair/stdair_types.hpp 2010-12-03 15:20:52 UTC (rev 386) +++ branches/stdair/0.9.0/main/stdair/stdair_types.hpp 2010-12-03 15:33:52 UTC (rev 387) @@ -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. |