diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2012-10-29 16:33:00 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-10-29 16:33:00 +0200 |
commit | 83374c27062772de95ab12652713bfb2c218ba48 (patch) | |
tree | 0d5758ad04f0b4b64c76325cc9aca2b5892bf012 /odb/oracle/query.hxx | |
parent | eb933eabc025762d82180eb348dcdef9ff0a6ec9 (diff) |
Don't use boolean as identifier2.2.0.a1
Some headers/systems defined it as a macro.
Diffstat (limited to 'odb/oracle/query.hxx')
-rw-r--r-- | odb/oracle/query.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/odb/oracle/query.hxx b/odb/oracle/query.hxx index 0e753f3..9980833 100644 --- a/odb/oracle/query.hxx +++ b/odb/oracle/query.hxx @@ -110,15 +110,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. @@ -143,14 +143,14 @@ namespace odb query_base (const char* native) : binding_ (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) { - 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) @@ -213,7 +213,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; } |