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

[<nbo...@us...>]

Revision: 269
          http://stdair.svn.sourceforge.net/stdair/?rev=269&view=rev
Author:   nbondoux
Date:     2010-08-13 18:56:29 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
When using non buried SOCI headers, CFLAGS must contain include/soci dir.

Modified Paths:
--------------
    trunk/stdair/stdair/command/DBManagerForAirlines.cpp
    trunk/stdair/stdair/dbadaptor/DbaAirline.hpp
    trunk/stdair/stdair/service/DBSessionManager.cpp

Modified: trunk/stdair/stdair/command/DBManagerForAirlines.cpp
===================================================================
--- trunk/stdair/stdair/command/DBManagerForAirlines.cpp	2010-08-13 18:55:13 UTC (rev 268)
+++ trunk/stdair/stdair/command/DBManagerForAirlines.cpp	2010-08-13 18:56:29 UTC (rev 269)
@@ -8,8 +8,8 @@
 #include <soci/core/soci.h>
 #include <soci/backends/mysql/soci-mysql.h>
 #else // SOCI_HEADERS_BURIED
-#include <soci/soci.h>
-#include <soci/soci-mysql.h>
+#include <soci.h>
+#include <mysql/soci-mysql.h>
 #endif // SOCI_HEADERS_BURIED
 // StdAir
 #include <stdair/bom/AirlineStruct.hpp>

Modified: trunk/stdair/stdair/dbadaptor/DbaAirline.hpp
===================================================================
--- trunk/stdair/stdair/dbadaptor/DbaAirline.hpp	2010-08-13 18:55:13 UTC (rev 268)
+++ trunk/stdair/stdair/dbadaptor/DbaAirline.hpp	2010-08-13 18:56:29 UTC (rev 269)
@@ -8,7 +8,7 @@
 #if defined(SOCI_HEADERS_BURIED)
 #include <soci/core/soci.h>
 #else // SOCI_HEADERS_BURIED
-#include <soci/soci.h>
+#include <soci.h>
 #endif // SOCI_HEADERS_BURIED
 
 // Forward declarations

Modified: trunk/stdair/stdair/service/DBSessionManager.cpp
===================================================================
--- trunk/stdair/stdair/service/DBSessionManager.cpp	2010-08-13 18:55:13 UTC (rev 268)
+++ trunk/stdair/stdair/service/DBSessionManager.cpp	2010-08-13 18:56:29 UTC (rev 269)
@@ -10,8 +10,8 @@
 #include <soci/core/soci.h>
 #include <soci/backends/mysql/soci-mysql.h>
 #else // SOCI_HEADERS_BURIED
-#include <soci/soci.h>
-#include <soci/soci-mysql.h>
+#include <soci.h>
+#include <mysql/soci-mysql.h>
 #endif // SOCI_HEADERS_BURIED
 // StdAir
 #include <stdair/basic/BasDBParams.hpp>


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