diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2013-02-07 15:39:52 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-02-07 15:39:52 +0200 |
| commit | 268a81f341c6b3d4e69766711f9f1487686dccb4 (patch) | |
| tree | f72e5bf6f051becebbefaf50e028ae6475163e98 | |
| parent | 896e25ffb698431e07dd787783642404840b2171 (diff) | |
Rename boolean to boolean_ (macro clash)
| -rw-r--r-- | odb/pgsql/pgsql-types.hxx | 2 | ||||
| -rw-r--r-- | odb/pgsql/query.hxx | 2 | ||||
| -rw-r--r-- | odb/pgsql/statement.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/odb/pgsql/pgsql-types.hxx b/odb/pgsql/pgsql-types.hxx index 8f9ce81..0d310b9 100644 --- a/odb/pgsql/pgsql-types.hxx +++ b/odb/pgsql/pgsql-types.hxx @@ -22,7 +22,7 @@ namespace odb { enum buffer_type { - boolean, // Buffer is a bool; size, capacity, truncated are unused. + boolean_, // Buffer is a bool; size, capacity, truncated are unused. smallint, // Buffer is short; size, capacity, truncated are unused. integer, // Buffer is int; size, capacity, truncated are unused. bigint, // Buffer is long long; size, capacity, truncated are unused. diff --git a/odb/pgsql/query.hxx b/odb/pgsql/query.hxx index 5acf24e..23234f3 100644 --- a/odb/pgsql/query.hxx +++ b/odb/pgsql/query.hxx @@ -1355,7 +1355,7 @@ namespace odb virtual void bind (bind_type* b) { - b->type = bind::boolean; + b->type = bind::boolean_; b->buffer = &image_; } diff --git a/odb/pgsql/statement.cxx b/odb/pgsql/statement.cxx index d522dfa..3aed485 100644 --- a/odb/pgsql/statement.cxx +++ b/odb/pgsql/statement.cxx @@ -191,7 +191,7 @@ namespace odb switch (current_bind.type) { - case bind::boolean: + case bind::boolean_: { l = sizeof (bool); break; @@ -295,7 +295,7 @@ namespace odb switch (b.type) { - case bind::boolean: + case bind::boolean_: { *static_cast<bool*> (b.buffer) = *reinterpret_cast<const bool*> (v); |