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

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

Revision: 265
          http://stdair.svn.sourceforge.net/stdair/?rev=265&view=rev
Author:   denis_arnaud
Date:     2010-08-13 14:41:22 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
[Dev] Added a pragma check for non-Fedora SOCI distributions.

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

Modified: trunk/stdair/stdair/dbadaptor/DbaAirline.hpp
===================================================================
--- trunk/stdair/stdair/dbadaptor/DbaAirline.hpp	2010-08-13 14:37:26 UTC (rev 264)
+++ trunk/stdair/stdair/dbadaptor/DbaAirline.hpp	2010-08-13 14:41:22 UTC (rev 265)
@@ -5,7 +5,11 @@
 // Import section
 // //////////////////////////////////////////////////////////////////////
 // SOCI
+#if defined(SOCI_HEADERS_BURIED)
 #include <soci/core/soci.h>
+#else // SOCI_HEADERS_BURIED
+#include <soci.h>
+#endif // SOCI_HEADERS_BURIED
 
 // Forward declarations
 namespace stdair {

Modified: trunk/stdair/stdair/service/DBSessionManager.cpp
===================================================================
--- trunk/stdair/stdair/service/DBSessionManager.cpp	2010-08-13 14:37:26 UTC (rev 264)
+++ trunk/stdair/stdair/service/DBSessionManager.cpp	2010-08-13 14:41:22 UTC (rev 265)
@@ -6,8 +6,13 @@
 #include <string>
 #include <sstream>
 // SOCI
+#if defined(SOCI_HEADERS_BURIED)
 #include <soci/core/soci.h>
 #include <soci/backends/mysql/soci-mysql.h>
+#else // SOCI_HEADERS_BURIED
+#include <soci.h>
+#include <soci-mysql.h>
+#endif // SOCI_HEADERS_BURIED
 // StdAir
 #include <stdair/basic/BasDBParams.hpp>
 #include <stdair/service/DBSessionManager.hpp>


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