aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-07-17 09:19:35 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-07-17 09:19:35 +0200
commitcc2c516beec6321c1864ba2b05904a56d665f9b3 (patch)
tree24e2984daa258220157871793ba4e349f5d3f819
parent8101ed727f48216e887183dc3c7b5d96e37c2650 (diff)
Remove unnecessary instance<> usage
-rw-r--r--odb/relational/mssql/schema.cxx4
-rw-r--r--odb/relational/oracle/schema.cxx4
-rw-r--r--odb/relational/pgsql/schema.cxx4
-rw-r--r--odb/relational/pgsql/source.cxx46
4 files changed, 29 insertions, 29 deletions
diff --git a/odb/relational/mssql/schema.cxx b/odb/relational/mssql/schema.cxx
index 91bb891..ebbda2c 100644
--- a/odb/relational/mssql/schema.cxx
+++ b/odb/relational/mssql/schema.cxx
@@ -284,8 +284,8 @@ namespace relational
// Add foreign keys.
//
- instance<add_foreign_key> fk (format_, *this);
- trav_rel::unames n (*fk);
+ add_foreign_key fk (format_, *this);
+ trav_rel::unames n (fk);
names (t, n);
}
diff --git a/odb/relational/oracle/schema.cxx b/odb/relational/oracle/schema.cxx
index e882a4a..bf040e0 100644
--- a/odb/relational/oracle/schema.cxx
+++ b/odb/relational/oracle/schema.cxx
@@ -329,8 +329,8 @@ namespace relational
// Add foreign keys.
//
- instance<add_foreign_key> fk (format_, *this);
- trav_rel::unames n (*fk);
+ add_foreign_key fk (format_, *this);
+ trav_rel::unames n (fk);
names (t, n);
}
}
diff --git a/odb/relational/pgsql/schema.cxx b/odb/relational/pgsql/schema.cxx
index 393dbe3..c774561 100644
--- a/odb/relational/pgsql/schema.cxx
+++ b/odb/relational/pgsql/schema.cxx
@@ -161,8 +161,8 @@ namespace relational
// Add foreign keys.
//
- instance<add_foreign_key> fk (format_, *this);
- trav_rel::unames n (*fk);
+ add_foreign_key fk (format_, *this);
+ trav_rel::unames n (fk);
names (t, n);
}
diff --git a/odb/relational/pgsql/source.cxx b/odb/relational/pgsql/source.cxx
index 6580c21..26df223 100644
--- a/odb/relational/pgsql/source.cxx
+++ b/odb/relational/pgsql/source.cxx
@@ -719,8 +719,8 @@ namespace relational
<< "persist_statement_types[] ="
<< "{";
- instance<statement_oids> st (statement_insert);
- st->traverse (c);
+ statement_oids st (statement_insert);
+ st.traverse (c);
os << "};";
}
@@ -733,8 +733,8 @@ namespace relational
<< "find_statement_types[] ="
<< "{";
- instance<statement_oids> st (statement_select);
- st->traverse (*id);
+ statement_oids st (statement_select);
+ st.traverse (*id);
os << "};";
}
@@ -748,18 +748,18 @@ namespace relational
<< "{";
{
- instance<statement_oids> st (statement_update);
- st->traverse (c);
+ statement_oids st (statement_update);
+ st.traverse (c);
}
bool first (cc.total == cc.id + cc.inverse + cc.readonly +
cc.optimistic_managed);
- instance<statement_oids> st (statement_where, first);
- st->traverse (*id);
+ statement_oids st (statement_where, first);
+ st.traverse (*id);
if (optimistic != 0)
- st->traverse (*optimistic);
+ st.traverse (*optimistic);
os << "};";
}
@@ -770,9 +770,9 @@ namespace relational
<< "optimistic_erase_statement_types[] ="
<< "{";
- instance<statement_oids> st (statement_where);
- st->traverse (*id);
- st->traverse (*optimistic);
+ statement_oids st (statement_where);
+ st.traverse (*id);
+ st.traverse (*optimistic);
os << "};";
}
@@ -880,22 +880,22 @@ namespace relational
<< "select_all_types[] ="
<< "{";
- instance<statement_oids> so (statement_where);
+ statement_oids so (statement_where);
if (inv)
{
// many(i)-to-many
//
if (container (*inv_m))
- so->traverse (*inv_m, idt, "value", "value");
+ so.traverse (*inv_m, idt, "value", "value");
// many(i)-to-one
//
else
- so->traverse (*inv_m);
+ so.traverse (*inv_m);
}
else
- so->traverse (m, idt, "id", "object_id");
+ so.traverse (m, idt, "id", "object_id");
os << "};";
}
@@ -909,22 +909,22 @@ namespace relational
if (!inv)
{
- instance<statement_oids> so (statement_insert);
+ statement_oids so (statement_insert);
- so->traverse (m, idt, "id", "object_id");
+ so.traverse (m, idt, "id", "object_id");
switch (container_kind (t))
{
case ck_ordered:
{
if (!unordered (m))
- so->traverse (m, container_it (t), "index", "index");
+ so.traverse (m, container_it (t), "index", "index");
break;
}
case ck_map:
case ck_multimap:
{
- so->traverse (m, container_kt (t), "key", "key");
+ so.traverse (m, container_kt (t), "key", "key");
break;
}
case ck_set:
@@ -934,7 +934,7 @@ namespace relational
}
}
- so->traverse (m, vt, "value", "value");
+ so.traverse (m, vt, "value", "value");
}
else
// MSVC does not allow zero length arrays or uninitialized
@@ -954,8 +954,8 @@ namespace relational
if (!inv)
{
- instance<statement_oids> so (statement_where);
- so->traverse (m, idt, "id", "object_id");
+ statement_oids so (statement_where);
+ so.traverse (m, idt, "id", "object_id");
}
else
os << "0";