From 2eac10b0aae159bdfc249c67f11b32a65036352d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 29 Oct 2012 16:33:00 +0200
Subject: Don't use boolean as identifier

Some headers/systems defined it as a macro.
---
 odb/pgsql/query.hxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/odb/pgsql/query.hxx b/odb/pgsql/query.hxx
index 2a1c6b8..401f29a 100644
--- a/odb/pgsql/query.hxx
+++ b/odb/pgsql/query.hxx
@@ -93,15 +93,15 @@ namespace odb
       {
         enum kind_type
         {
-          column,
-          param,
-          native,
-          boolean
+          kind_column,
+          kind_param,
+          kind_native,
+          kind_bool
         };
 
         clause_part (kind_type k): kind (k) {}
         clause_part (kind_type k, const std::string& p): kind (k), part (p) {}
-        clause_part (bool p): kind (boolean), bool_part (p) {}
+        clause_part (bool p): kind (kind_bool), bool_part (p) {}
 
         kind_type kind;
         std::string part; // If kind is param, then part is conversion expr.
@@ -126,14 +126,14 @@ namespace odb
       query_base (const char* native)
         : binding_ (0, 0), native_binding_ (0, 0, 0, 0)
       {
-        clause_.push_back (clause_part (clause_part::native, native));
+        clause_.push_back (clause_part (clause_part::kind_native, native));
       }
 
       explicit
       query_base (const std::string& native)
         : binding_ (0, 0), native_binding_ (0, 0, 0, 0)
       {
-        clause_.push_back (clause_part (clause_part::native, native));
+        clause_.push_back (clause_part (clause_part::kind_native, native));
       }
 
       query_base (const char* table, const char* column)
@@ -208,7 +208,7 @@ namespace odb
       const_true () const
       {
         return clause_.size () == 1 &&
-          clause_.front ().kind == clause_part::boolean &&
+          clause_.front ().kind == clause_part::kind_bool &&
           clause_.front ().bool_part;
       }
 
-- 
cgit v1.1