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

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

(limited to 'odb')

diff --git a/odb/sqlite/makefile b/odb/sqlite/makefile
index e9115a7..ae355a8 100644
--- a/odb/sqlite/makefile
+++ b/odb/sqlite/makefile
@@ -13,6 +13,7 @@ error.cxx               \
 exceptions.cxx          \
 object-statements.cxx   \
 query.cxx               \
+query-const-expr.cxx    \
 result.cxx              \
 statement-cache.cxx     \
 statement.cxx           \
diff --git a/odb/sqlite/query-const-expr.cxx b/odb/sqlite/query-const-expr.cxx
new file mode 100644
index 0000000..49c5a6c
--- /dev/null
+++ b/odb/sqlite/query-const-expr.cxx
@@ -0,0 +1,16 @@
+// file      : odb/sqlite/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/sqlite/query.hxx>
+
+namespace odb
+{
+  namespace sqlite
+  {
+    // Sun CC cannot handle this in query.cxx.
+    //
+    const query query::true_expr (true);
+  }
+}
diff --git a/odb/sqlite/query.cxx b/odb/sqlite/query.cxx
index c3fd31e..222805b 100644
--- a/odb/sqlite/query.cxx
+++ b/odb/sqlite/query.cxx
@@ -128,10 +128,6 @@ namespace odb
     // query
     //
 
-    // query
-    //
-    const query query::true_expr (true);
-
     query::
     query (const query& q)
         : clause_ (q.clause_),
-- 
cgit v1.1