From 37cad6c86aca85b1cf571d244047c0f311d69643 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 3 Oct 2011 15:19:23 +0200
Subject: Work around bug in Sun CC

---
 odb/pgsql/makefile             |  1 +
 odb/pgsql/query-const-expr.cxx | 16 ++++++++++++++++
 odb/pgsql/query.cxx            |  2 --
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 odb/pgsql/query-const-expr.cxx

diff --git a/odb/pgsql/makefile b/odb/pgsql/makefile
index 23b7903..647ab85 100644
--- a/odb/pgsql/makefile
+++ b/odb/pgsql/makefile
@@ -20,6 +20,7 @@ traits.cxx                \
 transaction.cxx           \
 transaction-impl.cxx      \
 query.cxx                 \
+query-const-expr.cxx      \
 details/endian-traits.cxx
 
 cli_tun := details/options.cli
diff --git a/odb/pgsql/query-const-expr.cxx b/odb/pgsql/query-const-expr.cxx
new file mode 100644
index 0000000..94f1417
--- /dev/null
+++ b/odb/pgsql/query-const-expr.cxx
@@ -0,0 +1,16 @@
+// file      : odb/pgsql/query-const-expr.cxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#include <odb/pgsql/query.hxx>
+
+namespace odb
+{
+  namespace pgsql
+  {
+    // Sun CC cannot handle this in query.cxx.
+    //
+    const query query::true_expr (true);
+  }
+}
diff --git a/odb/pgsql/query.cxx b/odb/pgsql/query.cxx
index 9fcaa04..b32959e 100644
--- a/odb/pgsql/query.cxx
+++ b/odb/pgsql/query.cxx
@@ -26,8 +26,6 @@ namespace odb
 
     // query
     //
-    const query query::true_expr (true);
-
     query::
     query (const query& q)
         : clause_ (q.clause_),
-- 
cgit v1.1