aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-10-03 15:19:22 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-10-03 15:19:22 +0200
commitb3c8917441b54404d808d80e17e9dc55bae1e950 (patch)
tree98036fa034c37662bc6dc5c76567aab35c78ed1d
parent8888f4025d456954f1b27dbca76433a43147866a (diff)
Work around bug in Sun CC1.6.01.6
-rw-r--r--odb/mysql/makefile1
-rw-r--r--odb/mysql/query-const-expr.cxx16
-rw-r--r--odb/mysql/query.cxx2
3 files changed, 17 insertions, 2 deletions
diff --git a/odb/mysql/makefile b/odb/mysql/makefile
index 19affbd..9644536 100644
--- a/odb/mysql/makefile
+++ b/odb/mysql/makefile
@@ -14,6 +14,7 @@ error.cxx \
exceptions.cxx \
object-statements.cxx \
query.cxx \
+query-const-expr.cxx \
statement.cxx \
statements-base.cxx \
transaction.cxx \
diff --git a/odb/mysql/query-const-expr.cxx b/odb/mysql/query-const-expr.cxx
new file mode 100644
index 0000000..55daa23
--- /dev/null
+++ b/odb/mysql/query-const-expr.cxx
@@ -0,0 +1,16 @@
+// file : odb/mysql/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/mysql/query.hxx>
+
+namespace odb
+{
+ namespace mysql
+ {
+ // Sun CC cannot handle this in query.cxx.
+ //
+ const query query::true_expr (true);
+ }
+}
diff --git a/odb/mysql/query.cxx b/odb/mysql/query.cxx
index 57ebc11..b313b0e 100644
--- a/odb/mysql/query.cxx
+++ b/odb/mysql/query.cxx
@@ -23,8 +23,6 @@ namespace odb
// query
//
- const query query::true_expr (true);
-
query::
query (const query& q)
: clause_ (q.clause_),