From b70088d31a8d3e78409f4247c1f2db9092e828e3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 22 Jul 2011 20:43:35 +0200
Subject: Get rid of libpq-fe.h inclusion in public headers

The problem with libpq-fe.h is that it is installed in unpredictable
places on different platforms. As a result, a user that uses ODB with
PostgreSQL (and who doesn't really know or care about libpq) is forced
to make sure their application is able to find and include libpq-fe.h
correctly.

Luckily for us, we only use a handful of libpq pointers in public
headers and the workaround is to forward declare them and use that
instead of including libpq-fe.h (which is instead included in source
files).
---
 odb/pgsql/statement.hxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'odb/pgsql/statement.hxx')

diff --git a/odb/pgsql/statement.hxx b/odb/pgsql/statement.hxx
index e248b07..3a25f5e 100644
--- a/odb/pgsql/statement.hxx
+++ b/odb/pgsql/statement.hxx
@@ -11,13 +11,11 @@
 #include <string>
 #include <cstddef>  // std::size_t
 
-#include <libpq-fe.h>
-
 #include <odb/details/shared-ptr.hxx>
 
 #include <odb/pgsql/version.hxx>
 #include <odb/pgsql/binding.hxx>
-#include <odb/pgsql/result-ptr.hxx>
+#include <odb/pgsql/pgsql-fwd.hxx>
 
 #include <odb/pgsql/details/export.hxx>
 
@@ -159,7 +157,7 @@ namespace odb
 
       binding& data_;
 
-      result_ptr result_;
+      PGresult* result_;
       std::size_t row_count_;
       std::size_t current_row_;
     };
-- 
cgit v1.1